Merge pull request #40 from luwei0917/Wei_Lu

Wei_Lu
Update game.core.js
Merge remote-tracking branch 'origin/master' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js