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

Conflicts:
	AndroidManifest.xml
	src/com/comdosoft/homework/HomeWorkMainActivity.java
	src/com/comdosoft/homework/SwitchClassActivity.java
	src/com/comdosoft/homework/adapter/AboutMeAdapter.java