UI scaling improvements and code cleanup
Merge branch 'master' into gameplay

Conflicts:
	Assets/Scripts/UI.cs