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

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/comdosoft/homework/Main_classes.class
	bin/classes/com/comdosoft/homework/SwitchClassActivity.class
	bin/classes/com/comdosoft/homework/adapter/MainClssStuAdapter.class
	bin/classes/com/comdosoft/homework/adapter/SwitchClassAdapter.class
	bin/classes/com/comdosoft/homework/tools/Urlinterface.class
	bin/homework_app.apk
	bin/resources.ap_
	src/com/comdosoft/homework/tools/Urlinterface.java