Merge branch 'master' into Wei_Lu
FInal
Revert "FInal"

This reverts commit b37ca4738ca09b5febfe280bb4b0ab4972dc8651.
Revert "Revert "FInal""

This reverts commit 6c9bf02faec5edea7cb1436d73581f4943531d13.
I WANT
Revert "I WANT"

This reverts commit 6dabbd9234526fcdddc1c381558dfbc25c92f0c9.
FFF
new
Merge remote-tracking branch 'origin/Wei_Lu' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js
Merge remote-tracking branch 'origin/Wei_Lu' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js