New preferences
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
Merge branch 'master' of https://github.com/ZomgPonies/Paradise