合并王乐之修改
Merge branch 'master' of github.com:wqycsu/CSUApp

Conflicts:
	bin/CSUCommApp.apk
	bin/classes.dex
	bin/classes/com/csu/commapp/R$id.class
	bin/classes/com/csu/commapp/R$layout.class
	bin/classes/com/csu/commapp/R$menu.class
	bin/classes/com/csu/commapp/R$string.class
	bin/classes/com/csu/commapp/R$style.class
	bin/classes/com/csu/commapp/activity/LoginActivity.class
	bin/classes/com/csu/commapp/activity/MyBaseActivity.class
	bin/classes/com/csu/commapp/fragment/MenuFragment.class
	bin/classes/com/csu/commapp/fragment/SlidFragment$ListAdapter.class
	bin/classes/com/csu/commapp/fragment/SlidFragment.class
	bin/classes/com/csu/commapp/slidview/MySlidView.class
	bin/resources.ap_
	gen/com/csu/commapp/R.java
	src/com/csu/commapp/activity/MyBaseActivity.java