Merge remote-tracking branch 'origin/sj' into vz

Conflicts:
	GoblinVendetta/Assets/Scripts/Controller2D.cs
	GoblinVendetta/ProjectSettings/TagManager.asset