Merge pull request #30 from ToshikawaSeita/MyBranch

お願いします
ref proj SeaFly and Enemy
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/EnemyManager.cpp
	Classes/PlayerSprite.cpp
	Classes/SeaFireFlyManager.cpp
	Classes/Stone.cpp
ref SeaFly
change SeaFireFly

12_05update
change SeaFireFly

12_05update
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/SeaFireFly.h
	Classes/SeaFireFlyManager.cpp
	Classes/TestLayer.cpp
Audio

Audio
change SeaFireFly

12_05update
change SeaFireFly

12_05update
Merge branch 'MegaKoba' of https://github.com/kobayashimega/FishLight into MegaKoba

Conflicts:
	Classes/SeaFireFlyManager.cpp
	Classes/SeaFireFlyManager.h
Merge pull request #31 from kobayashimega/MegaKoba

Mega koba
Audio

Audio
Audio

Audio
Audio

Audio
Merge branch 'b_setuko' of https://github.com/setu15/FishLight into b_setuko
Audio

Audio
Merge pull request #32 from setu15/b_setuko

B setuko
2014/12/06 Toshikawa

Physicsを仕様に合わせて修正。
ステージセレクト用のクラスを少し追加。
デストラクタでmapの要素を解放する様に変更。
Merge branch 'MyBranch' of https://github.com/ToshikawaSeita/FishLight into MyBranch