update模板
Merge branch 'master' of github.com:zhiyan/ZUI

Conflicts:
	demo/common/nav.html
	demo/dist/css/ZUI.min.css
	demo/dist/js/ZUI.js
	demo/dist/js/ZUI.min.js
	dist/js/ZUI.js
	dist/js/ZUI.min.js