Fixed slider knob/volume stuff, again
Merge remote-cunt-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Managers/AudioManager.cs
	Assets/Scripts/Managers/ButtonManager.cs