In order to get yimai's change
Merge branch 'master' of https://github.com/glc12125/History

Conflicts:
	bin/classes/appathon/history/models/User.class
Merge branch 'master' of https://github.com/glc12125/History