制造冲突
修复跑错的bug
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	EzHerald/src/com/herald/ezherald/exercise/ExerciseActivity.java