options not fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/UI/In-Game Menus/Options/Options.cs