Merge branch 'master' of https://github.com/ww20081120/ui-lib
Merge branch 'master' of https://github.com/ww20081120/ui-lib

Conflicts:
	JsLib/m2m.ui.core-2.0.1.js
	JsLib/m2m.ui.utils-2.0.1.js