User Prefs Changes

Some changes
Merge branch 'master' of https://github.com/GitCrnchber/Rebels_Timer_2

Conflicts:
	Rebels_Timer_2.userprefs