sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gibbo.Editor.WPF/Project Templates/Gibbo.Engine.Windows.exe