All input is now treated equally
Merge branch 'master' into gameplay

Conflicts:
	Assets/Scripts/State.cs
	Assets/Scripts/UI.cs
	ProjectSettings/InputManager.asset