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

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/biaoqianwriteback.png