modify login
Merge branch 'develop' of github.com:hyrtyp/app into develop

Conflicts:
	src/main/res/layout/user_main_top.xml