gs
modify
Merge branch 'master' of github.com:lifang/homework_app

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/comdosoft/homework/Class_xinxiliu$1.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$2.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$Adapter.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$MicropostAdapter$1.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$MicropostAdapter$2.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$MicropostAdapter.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$1.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$2.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$Adapter.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter$1.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter$2.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter.class
	bin/classes/com/comdosoft/homework/Classxinxiliu.class
	bin/classes/com/comdosoft/homework/DictationBeginActivity.class
	bin/classes/com/comdosoft/homework/DictationPrepareActivity$MyThread.class
	bin/classes/com/comdosoft/homework/DictationPrepareActivity.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$MyQuestionAdapter.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$MyWorkDateAdapter.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$getClassInfo.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity.class
	bin/classes/com/comdosoft/homework/MainActivity.class
	bin/classes/com/comdosoft/homework/Main_classes.class
	bin/classes/com/comdosoft/homework/QuestionSpeakActivity.class
	bin/classes/com/comdosoft/homework/R$drawable.class
	bin/classes/com/comdosoft/homework/R$id.class
	bin/classes/com/comdosoft/homework/R$layout.class
	bin/classes/com/comdosoft/homework/R$menu.class
	bin/classes/com/comdosoft/homework/R$string.class
	bin/classes/com/comdosoft/homework/R$style.class
	bin/classes/com/comdosoft/homework/RegistrationActivity.class
	bin/classes/com/comdosoft/homework/SettingActivity.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$1.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity.class
	bin/classes/com/comdosoft/homework/SwitchClassActivity.class
	bin/classes/com/comdosoft/homework/adapter/Adapter.class
	bin/classes/com/comdosoft/homework/adapter/MainClssStuAdapter.class
	bin/classes/com/comdosoft/homework/adapter/SwitchClassAdapter.class
	bin/classes/com/comdosoft/homework/class_xinxiliu.class
	bin/classes/com/comdosoft/homework/tools/AsyncImageLoader$1.class
	bin/classes/com/comdosoft/homework/tools/AsyncImageLoader$2.class
	bin/classes/com/comdosoft/homework/tools/AsyncImageLoader.class
	bin/classes/com/comdosoft/homework/tools/HomeWorkTool.class
	bin/classes/com/comdosoft/homework/tools/ListeningQuestionMap.class
	bin/classes/com/comdosoft/homework/tools/MyGifView.class
	bin/classes/com/comdosoft/homework/tools/Urlinterface.class
	bin/homework_app.apk
	bin/resources.ap_
	gen/com/comdosoft/homework/R.java
	res/layout/activity_main.xml
	src/com/comdosoft/homework/tools/AsyncImageLoader.java
	src/com/comdosoft/homework/tools/HomeWorkTool.java
	src/com/comdosoft/homework/tools/Urlinterface.java
gs