Merge pull request #49 from luwei0917/Wei_Lu

receiveKitty
4/1/2014
4/1/2014
Merge pull request #50 from luwei0917/Wei_Lu

5:24
Merge pull request #51 from luwei0917/andy

4/1/2014
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js