STH
Merge branch 'master' of git@github.com:suntinghui/LKOA4Android.git

Conflicts:
	res/layout-hdpi/loginactivity.xml
	src/com/lkoa/activity/LoginActivity.java