sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Upgrade shooter.gmx/Upgrade shooter.project.gmx