Merge remote-tracking branch 'minimo/Stage3' into Stage3
bug fix
Merge remote-tracking branch 'minimo/Stage3' into develop

Conflicts:
	src/enemy/EnemyUnit.js
	src/stage/Stage.js
build
mana
bug fix
optimize for compiler
build
mana
Merge remote-tracking branch 'minimo/Stage3' into Stage3
Merge branch 'Stage3' into develop

Conflicts:
	src/enemy/EnemyHard.js
Merge branch 'develop' of git://github.com/daishihmr/glshooter2 into Stage3

Conflicts:
	src/enemy/EnemyHard.js
	src/enemy/EnemyUnit.js