update
update
Merge branch 'master' of https://github.com/foxui/fox-core

Conflicts:
	dist/foxui.js
	dist/foxui.min.js