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

Conflicts:
	AndroidManifest.xml
	src/com/comdosoft/ExerciseBook/AnswerDictationBeginActivity.java
	src/com/comdosoft/ExerciseBook/tools/ExerciseBookTool.java