diff --git a/andrea/css/andrea.css b/andrea/css/andrea.css
index be4fb30..1aefa9a 100644
--- a/andrea/css/andrea.css
+++ b/andrea/css/andrea.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/andrea/lang/lang_en_US.properties b/andrea/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/andrea/lang/lang_en_US.properties
+++ b/andrea/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/andrea/lang/lang_zh_CN.properties b/andrea/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/andrea/lang/lang_zh_CN.properties
+++ b/andrea/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/andrea/skin.properties b/andrea/skin.properties
index 2d2ab70..9644a38 100644
--- a/andrea/skin.properties
+++ b/andrea/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/bruce/css/bootstrap-theme.css b/bruce/css/bootstrap-theme.css
index bf109c3..f5178d5 100644
--- a/bruce/css/bootstrap-theme.css
+++ b/bruce/css/bootstrap-theme.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bruce/css/bootstrap.css b/bruce/css/bootstrap.css
index 1457e8d..210ddbb 100644
--- a/bruce/css/bootstrap.css
+++ b/bruce/css/bootstrap.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bruce/css/bruce.css b/bruce/css/bruce.css
index 9a66e17..c1264f1 100644
--- a/bruce/css/bruce.css
+++ b/bruce/css/bruce.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bruce/js/bootstrap.js b/bruce/js/bootstrap.js
index df6a087..a40a079 100644
--- a/bruce/js/bootstrap.js
+++ b/bruce/js/bootstrap.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bruce/js/bootstrap.min.js b/bruce/js/bootstrap.min.js
index 9b10c46..644bc55 100644
--- a/bruce/js/bootstrap.min.js
+++ b/bruce/js/bootstrap.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bruce/lang/lang_en_US.properties b/bruce/lang/lang_en_US.properties
index 9c40f7e..454035b 100644
--- a/bruce/lang/lang_en_US.properties
+++ b/bruce/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/bruce/lang/lang_zh_CN.properties b/bruce/lang/lang_zh_CN.properties
index 10df865..be0650a 100644
--- a/bruce/lang/lang_zh_CN.properties
+++ b/bruce/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/bruce/skin.properties b/bruce/skin.properties
index a11abcf..2d6bfb2 100644
--- a/bruce/skin.properties
+++ b/bruce/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/classic/css/classic.css b/classic/css/classic.css
index 42f2dfc..02a49cf 100644
--- a/classic/css/classic.css
+++ b/classic/css/classic.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/classic/lang/lang_en_US.properties b/classic/lang/lang_en_US.properties
index fe784d8..0da9e68 100644
--- a/classic/lang/lang_en_US.properties
+++ b/classic/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/classic/lang/lang_zh_CN.properties b/classic/lang/lang_zh_CN.properties
index 329cfde..efb8299 100644
--- a/classic/lang/lang_zh_CN.properties
+++ b/classic/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/classic/skin.properties b/classic/skin.properties
index a95f1ef..742d056 100644
--- a/classic/skin.properties
+++ b/classic/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/community/css/community.css b/community/css/community.css
index fe930cc..15c7be0 100644
--- a/community/css/community.css
+++ b/community/css/community.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/community/lang/lang_en_US.properties b/community/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/community/lang/lang_en_US.properties
+++ b/community/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/community/lang/lang_zh_CN.properties b/community/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/community/lang/lang_zh_CN.properties
+++ b/community/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/community/skin.properties b/community/skin.properties
index 7ba22cb..90b1e1f 100644
--- a/community/skin.properties
+++ b/community/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ease/css/ease.css b/ease/css/ease.css
index 7d0a5de..d1e9283 100644
--- a/ease/css/ease.css
+++ b/ease/css/ease.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ease/js/ease.js b/ease/js/ease.js
index d1ebb2f..64308f5 100644
--- a/ease/js/ease.js
+++ b/ease/js/ease.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ease/js/ease.min.js b/ease/js/ease.min.js
index dbcef86..77bdc9e 100644
--- a/ease/js/ease.min.js
+++ b/ease/js/ease.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ease/lang/lang_en_US.properties b/ease/lang/lang_en_US.properties
index feb3d03..168a070 100644
--- a/ease/lang/lang_en_US.properties
+++ b/ease/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ease/lang/lang_zh_CN.properties b/ease/lang/lang_zh_CN.properties
index e20d26b..54d28dc 100644
--- a/ease/lang/lang_zh_CN.properties
+++ b/ease/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ease/skin.properties b/ease/skin.properties
index d0a0348..8de5fd4 100644
--- a/ease/skin.properties
+++ b/ease/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/favourite/css/favourite.css b/favourite/css/favourite.css
index 8965f12..8a0652e 100644
--- a/favourite/css/favourite.css
+++ b/favourite/css/favourite.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/favourite/lang/lang_en_US.properties b/favourite/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/favourite/lang/lang_en_US.properties
+++ b/favourite/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/favourite/lang/lang_zh_CN.properties b/favourite/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/favourite/lang/lang_zh_CN.properties
+++ b/favourite/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/favourite/skin.properties b/favourite/skin.properties
index 6360065..15494a8 100644
--- a/favourite/skin.properties
+++ b/favourite/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/finding/css/finding.css b/finding/css/finding.css
index 5f70331..25eed26 100644
--- a/finding/css/finding.css
+++ b/finding/css/finding.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/finding/js/finding.js b/finding/js/finding.js
index bab29e8..b9d4f70 100644
--- a/finding/js/finding.js
+++ b/finding/js/finding.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/finding/js/finding.min.js b/finding/js/finding.min.js
index de15ebf..9ef266e 100644
--- a/finding/js/finding.min.js
+++ b/finding/js/finding.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/finding/lang/lang_en_US.properties b/finding/lang/lang_en_US.properties
index 13a2f64..df9a9d1 100644
--- a/finding/lang/lang_en_US.properties
+++ b/finding/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/finding/lang/lang_zh_CN.properties b/finding/lang/lang_zh_CN.properties
index 19661fb..b29936c 100644
--- a/finding/lang/lang_zh_CN.properties
+++ b/finding/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/finding/skin.properties b/finding/skin.properties
index 572d951..2ef88e6 100644
--- a/finding/skin.properties
+++ b/finding/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/i-nove/css/i-nove.css b/i-nove/css/i-nove.css
index 95e6026..81152a3 100644
--- a/i-nove/css/i-nove.css
+++ b/i-nove/css/i-nove.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/i-nove/lang/lang_en_US.properties b/i-nove/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/i-nove/lang/lang_en_US.properties
+++ b/i-nove/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/i-nove/lang/lang_zh_CN.properties b/i-nove/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/i-nove/lang/lang_zh_CN.properties
+++ b/i-nove/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/i-nove/skin.properties b/i-nove/skin.properties
index 0160e74..33d9f38 100644
--- a/i-nove/skin.properties
+++ b/i-nove/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metro-hot/css/metro-hot-responsive.css b/metro-hot/css/metro-hot-responsive.css
index deb4877..4cbfc62 100644
--- a/metro-hot/css/metro-hot-responsive.css
+++ b/metro-hot/css/metro-hot-responsive.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/metro-hot/css/metro-hot.css b/metro-hot/css/metro-hot.css
index 9dd2104..3067015 100644
--- a/metro-hot/css/metro-hot.css
+++ b/metro-hot/css/metro-hot.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/metro-hot/js/metro-hot.js b/metro-hot/js/metro-hot.js
index c02959e..45827d2 100644
--- a/metro-hot/js/metro-hot.js
+++ b/metro-hot/js/metro-hot.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/metro-hot/js/metro-hot.min.js b/metro-hot/js/metro-hot.min.js
index 09e8265..42f4bac 100644
--- a/metro-hot/js/metro-hot.min.js
+++ b/metro-hot/js/metro-hot.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/metro-hot/lang/lang_en_US.properties b/metro-hot/lang/lang_en_US.properties
index c84bc8b..6282251 100644
--- a/metro-hot/lang/lang_en_US.properties
+++ b/metro-hot/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metro-hot/lang/lang_zh_CN.properties b/metro-hot/lang/lang_zh_CN.properties
index 5fe0e1e..b13693a 100644
--- a/metro-hot/lang/lang_zh_CN.properties
+++ b/metro-hot/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metro-hot/skin.properties b/metro-hot/skin.properties
index 29e18db..56295bb 100644
--- a/metro-hot/skin.properties
+++ b/metro-hot/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/mobile/js/l10n.js b/mobile/js/l10n.js
index 7e70f0b..4ada73b 100644
--- a/mobile/js/l10n.js
+++ b/mobile/js/l10n.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/mobile/js/l10n.min.js b/mobile/js/l10n.min.js
index f7ce128..4ff4f5e 100644
--- a/mobile/js/l10n.min.js
+++ b/mobile/js/l10n.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/mobile/lang/lang_en_US.properties b/mobile/lang/lang_en_US.properties
index 3b96aef..88e5c63 100644
--- a/mobile/lang/lang_en_US.properties
+++ b/mobile/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/mobile/lang/lang_zh_CN.properties b/mobile/lang/lang_zh_CN.properties
index 5a8aaa8..fc047ad 100644
--- a/mobile/lang/lang_zh_CN.properties
+++ b/mobile/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/mobile/skin.properties b/mobile/skin.properties
index 84ed5b5..91dbf10 100644
--- a/mobile/skin.properties
+++ b/mobile/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/neoease/css/neoease.css b/neoease/css/neoease.css
index 31ddb33..571cdcd 100644
--- a/neoease/css/neoease.css
+++ b/neoease/css/neoease.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/neoease/js/neoease.js b/neoease/js/neoease.js
index 2849c55..243242c 100644
--- a/neoease/js/neoease.js
+++ b/neoease/js/neoease.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/neoease/js/neoease.min.js b/neoease/js/neoease.min.js
index 55d3c90..93bf743 100644
--- a/neoease/js/neoease.min.js
+++ b/neoease/js/neoease.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/neoease/lang/lang_en_US.properties b/neoease/lang/lang_en_US.properties
index ab835ea..e6bba8e 100644
--- a/neoease/lang/lang_en_US.properties
+++ b/neoease/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/neoease/lang/lang_zh_CN.properties b/neoease/lang/lang_zh_CN.properties
index 170357c..fed99b3 100644
--- a/neoease/lang/lang_zh_CN.properties
+++ b/neoease/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/neoease/skin.properties b/neoease/skin.properties
index 58a3fd8..6093907 100644
--- a/neoease/skin.properties
+++ b/neoease/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/owmx-3.0/css/owmx-3.0.css b/owmx-3.0/css/owmx-3.0.css
index cee4f5b..b4ddd61 100644
--- a/owmx-3.0/css/owmx-3.0.css
+++ b/owmx-3.0/css/owmx-3.0.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/owmx-3.0/lang/lang_en_US.properties b/owmx-3.0/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/owmx-3.0/lang/lang_en_US.properties
+++ b/owmx-3.0/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/owmx-3.0/lang/lang_zh_CN.properties b/owmx-3.0/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/owmx-3.0/lang/lang_zh_CN.properties
+++ b/owmx-3.0/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/owmx-3.0/skin.properties b/owmx-3.0/skin.properties
index c070cf5..8d2c7c0 100644
--- a/owmx-3.0/skin.properties
+++ b/owmx-3.0/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/timeline/css/timeline.css b/timeline/css/timeline.css
index 0e1a646..63640c5 100644
--- a/timeline/css/timeline.css
+++ b/timeline/css/timeline.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/timeline/js/timeline.js b/timeline/js/timeline.js
index 4e99455..5c77f8b 100644
--- a/timeline/js/timeline.js
+++ b/timeline/js/timeline.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/timeline/js/timeline.min.js b/timeline/js/timeline.min.js
index 10d40ed..1f71b1d 100644
--- a/timeline/js/timeline.min.js
+++ b/timeline/js/timeline.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/timeline/lang/lang_en_US.properties b/timeline/lang/lang_en_US.properties
index 60365df..1086e40 100644
--- a/timeline/lang/lang_en_US.properties
+++ b/timeline/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/timeline/lang/lang_zh_CN.properties b/timeline/lang/lang_zh_CN.properties
index 3e4f40c..8e4ba43 100644
--- a/timeline/lang/lang_zh_CN.properties
+++ b/timeline/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/timeline/skin.properties b/timeline/skin.properties
index e42e7d4..c23f2ab 100644
--- a/timeline/skin.properties
+++ b/timeline/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tree-house/css/tree-house.css b/tree-house/css/tree-house.css
index 707963b..74808fe 100644
--- a/tree-house/css/tree-house.css
+++ b/tree-house/css/tree-house.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tree-house/lang/lang_en_US.properties b/tree-house/lang/lang_en_US.properties
index adaeab4..6bd51ff 100644
--- a/tree-house/lang/lang_en_US.properties
+++ b/tree-house/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tree-house/lang/lang_zh_CN.properties b/tree-house/lang/lang_zh_CN.properties
index 3b7782e..45a9a15 100644
--- a/tree-house/lang/lang_zh_CN.properties
+++ b/tree-house/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tree-house/skin.properties b/tree-house/skin.properties
index c0e8888..f8f86ec 100644
--- a/tree-house/skin.properties
+++ b/tree-house/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/yilia/css/yilia.css b/yilia/css/yilia.css
index d84d350..ce14cc6 100644
--- a/yilia/css/yilia.css
+++ b/yilia/css/yilia.css
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2010-2017, b3log.org & hacpai.com
+<<<<<<< HEAD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
  */
 /**
  * Copyright (c) 2010-2016, b3log.org & hacpai.com
+=======
+>>>>>>> origin/master
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/yilia/js/yilia.js b/yilia/js/yilia.js
index f3bc9a9..275c322 100644
--- a/yilia/js/yilia.js
+++ b/yilia/js/yilia.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/yilia/js/yilia.min.js b/yilia/js/yilia.min.js
index 761dd44..a1b11c6 100644
--- a/yilia/js/yilia.min.js
+++ b/yilia/js/yilia.min.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016, b3log.org & hacpai.com
+ * Copyright (c) 2010-2017, b3log.org & hacpai.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/yilia/lang/lang_en_US.properties b/yilia/lang/lang_en_US.properties
index 0d9427b..385475b 100644
--- a/yilia/lang/lang_en_US.properties
+++ b/yilia/lang/lang_en_US.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/yilia/lang/lang_zh_CN.properties b/yilia/lang/lang_zh_CN.properties
index 33e82fa..0b8c63b 100644
--- a/yilia/lang/lang_zh_CN.properties
+++ b/yilia/lang/lang_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/yilia/skin.properties b/yilia/skin.properties
index efc9725..9704133 100644
--- a/yilia/skin.properties
+++ b/yilia/skin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2016, b3log.org & hacpai.com
+# Copyright (c) 2010-2017, b3log.org & hacpai.com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.