datepicer冲突fix
Merge branch 'master' of github.com:zhiyan/ZUI

Conflicts:
	dist/js/ZUI.min.js
Merge branch 'master' of github.com:zhiyan/ZUI
update