login Ver0.2
gitbug
Merge branch 'master' of https://github.com/Janeliuwz/TEE

Conflicts:
	TEE686/src/com/tee686/activity/UserLoginActivity.java