Stage3 update
Conflict corrected
corectted
Merge branch 'Stage3' of https://github.com/minimo/glshooter2 into Stage3
Stage3 update
Merge branch 'develop' of git://github.com/daishihmr/glshooter2 into Stage3
update anon user default name