Merge remote-tracking branch 'origin/master' into 0.6.1

Conflicts:
	neoease/js/neoease.js
	neoease/js/neoease.min.js
	timeline/css/timeline.min.css
	timeline/js/timeline.min.js

timeline/js/timeline.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012, B3log Team
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * @fileoverview timeline js.
  *