Merge branch 'develop' into gh-pages

Conflicts:
	src/GlShooter2.js
Merge commit '9a7fa750934eabbbd87ba6843185b54604bbac14' into gh-pages

Conflicts:
	src/GlShooter2.js