initial user prefs
fix up user-prefs
Merge branch 'user_prefs'

Conflicts:
	src/Unlock/Models/Category.php
	src/controllers.php