在做学校选择页面

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

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/resources.ap_
	bin/taupstairs.apk
这次有了吧

Signed-off-by: baiwgi <296216078@qq.com>
chenjian 2013-12-9

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