Merge pull request #43 from luwei0917/master

AAA
Merge remote-tracking branch 'origin/master' into Wei_Lu

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

Wei lu
Merge pull request #45 from luwei0917/master

aaA
with maidibutton
Merge pull request #47 from luwei0917/kitsune

Kitsune
4:50
Merge pull request #48 from luwei0917/master

maidubutton
5:03
Merge pull request #49 from luwei0917/Wei_Lu

receiveKitty
4/1/2014
4/1/2014