Revert "1223"

This reverts commit 0838f86cdbb7ef4a7e6b75b5f13f06325ae7cd5a.

Conflicts:
	ShenmaApp/bin/classes/com/example/jiaxiaotong/R$id.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/R$layout.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/R$menu.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/R$string.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/R$style.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/activity/ChatActivity$MessageAdapter.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/activity/ChatActivity.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/activity/LoginActivity.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/activity/ParentFrame.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/activity/WelcomeActivity.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/fragment/StuFragment$UserAdapter.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/fragment/StuFragment.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/fragment/TchFragment$TeacherAdapter.class
	ShenmaApp/bin/classes/com/example/jiaxiaotong/utils/LoadingDialog.class
	ShenmaApp/gen/com/example/jiaxiaotong/R.java
	shenmaApp/bin/classes.dex
	shenmaApp/bin/resources.ap_