test
Merge branch 'master' of https://github.com/zhongshankeji/zszc3

Conflicts:
res/css/bootstrap.min.css
res/images/banner_bg.jpg
res/images/header1.jpg
res/images/slogan.png
res/js/bootstrap.min.js
res/js/jquery.singlePageNav.min.js
res/js/templatemo_script.js
res/js/templatemo_script_OLD.js
nav