Update game.core.js
Merge branch 'master' into Wei_Lu

Conflicts:
	public/javascripts/index.js