Merge branch 'master' into vz

Conflicts:
	GoblinVendetta/Assets/Scripts/Controller2D.cs
	GoblinVendetta/Assets/Scripts/GlobalVariables.cs