Stage3 update
Conflict corrected
corectted
Merge branch 'Stage3' of https://github.com/minimo/glshooter2 into Stage3