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

Conflicts:
	src/com/comdosoft/ExerciseBook/HomeWorkIngActivity.java