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

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