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

Conflicts:
	AndroidManifest.xml
	gen/com/comdosoft/ExerciseBook/R.java
	res/values/colors.xml
	res/values/strings.xml
	src/com/comdosoft/ExerciseBook/Table_TabHost.java
	src/com/comdosoft/ExerciseBook/tools/ExerciseBook.java
	src/com/comdosoft/ExerciseBook/tools/Urlinterface.java