ha ha
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu
Merge remote-tracking branch 'origin/Wei_Lu' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js