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

Conflicts:
	src/com/comdosoft/ExerciseBook/AnswerBaseActivity.java
	src/com/comdosoft/ExerciseBook/AnswerOrderActivity.java