20141003_テストブランチを統合
Merge branch 'master' of https://github.com/Nadd3564/ACTIONGAME

Conflicts:
	Assets/Scenes/PlayScene.unity