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

Conflicts:
	bin/classes.dex
	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/R$id.class
	bin/classes/com/comdosoft/homework/R$string.class
	bin/classes/com/comdosoft/homework/R$style.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/SwitchClassAdapter.class
	bin/classes/com/comdosoft/homework/pull/XListView.class
	bin/classes/com/comdosoft/homework/pull/XListViewFooter.class
	bin/classes/com/comdosoft/homework/pull/XListViewHeader.class
	bin/classes/com/comdosoft/homework/tools/ListeningQuestionMap.class
	bin/homework_app.apk
	bin/resources.ap_
	gen/com/comdosoft/homework/R.java