增添模板引擎
edit test for merge
edit test for merge
Merge branch 'newBranch' into gh-pages

Conflicts:
	js/tmpl.js
修改回来
还原测试修改
备份default.js文件
优化版本2014.11.2
Merge branch 'newBranch' into gh-pages

Conflicts:
	js/package/tmpl.js
优化图片切换效果等定时器
Merge branch 'newBranch' into gh-pages