修改loginactivity
Merge branch 'master' of github.com:hyrtyp/CNP_Account

Conflicts:
	src/main/java/com/hyrt/cnp/account/LoginActivity.java
Merge branch 'master' of github.com:hyrtyp/CNP_Account

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/hyrt/cnp/account/LoginActivity.java
	src/main/res/values/colors.xml
	src/main/res/values/strings.xml
no change
Merge branch 'master' of github.com:hyrtyp/CNP_Account

Conflicts:
	CNP_Account.iml
no chang