ligin
zh
Merge remote-tracking branch 'origin/master'
login
Merge branch 'master' of https://github.com/openkoala/KoalaUI.git
删除多余的属性
Merge branch 'master' of https://github.com/openkoala/KoalaUI.git
Merge branch 'master' of https://github.com/openkoala/KoalaUI.git

Conflicts:
	KoalaUI/Web/demos/login.html
	KoalaUI/Web/lib/koalaUI/koala-login.js