Akarun warp update
merge from daishihmr/glshooter2 develop
correct
Merge branch 'Stage3' into develop

Conflicts:
	assets/raw/kanade2.png
	assets/raw/l3p/kanade_cannon.$3P
	assets/raw/l3p/kanade_cannon.L3P
	assets/raw/l3p/kanade_cannon.L3P.BMP
	assets/tex5.png
	src/GlShooter2.js
	src/enemy/Danmaku.js
	src/enemy/EnemyHard.js
	src/enemy/EnemySoft.js
	src/stage/Stage.js
	src/stage/Stage5.js