Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js
Update game.core.js
Merge pull request #7 from luwei0917/Wei_Lu

Wei lu
Merge pull request #5 from luwei0917/master

zeng
Merge remote-tracking branch 'origin/kitsune' into kitsune
Merge branch 'master' into kitsune

Conflicts:
	public/javascripts/game.core.js
Update game.core.js
Merge pull request #8 from luwei0917/kitsune

Kitsune
Merge pull request #9 from luwei0917/master

aa