改改改
Merge branch 'master' of https://github.com/callmeharry/yihubaiying

Conflicts:
	views/mobile/mIndex.html
	views/mobile/mLogin.html
	views/mobile/mRegister.html