啊啊啊啊

啊啊啊啊
Merge branch 'jiang' of https://github.com/georgej/bbtl_android into jiang

Conflicts:
	BBTLLib/bin/bbtllib.jar

BBTLTenant/bin/classes/com/ffapp/bbtimeline/tenant/school/activity/Schoo
lCreateNewActivity.class
	BBTLTenant/res/layout/school_create_new.xml

BBTLTenant/src/com/ffapp/bbtimeline/tenant/school/activity/SchoolCreateN
ewActivity.java