ending
bug fix
Merge branch 'develop' of git://github.com/daishihmr/glshooter2 into Stage3