20141003_微修正
Merge branch 'master' of https://github.com/Nadd3564/ACTIONGAME

Conflicts:
	Assets/Scenes/PlayScene.unity
Merge remote-tracking branch 'origin/master'