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

Conflicts:
	.classpath
	AndroidManifest.xml
	gen/com/comdosoft/ExerciseBook/R.java
	lint.xml