other refactoring
Merge branch 'master' of https://github.com/ristes/apple-game.git

Conflicts:
	app/service/impl/ContextServiceImpl.java