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

Conflicts:
	demo/dist/css/ZUI.min.css
	demo/dist/js/ZUI.min.js
	demo/report/flight/js/controller.js
	demo/report/flight/js/util.js
	dist/css/ZUI.min.css
	dist/js/ZUI.min.js