Signed-off-by: baiwgi <296216078@qq.com>
Merge branch 'master' of ssh://git@github.com/hongdong/Ta.git

Conflicts:
	src/com/example/taupstairs/intent/IntentInfo.java
	src/com/example/taupstairs/ui/LoginActivity.java
	src/com/example/taupstairs/ui/SelectCollegeActivity.java