new
new
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js