一个不报错的版本
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	EzHerald/src/com/herald/ezherald/gpa/GPAActivity.java