Wire up preferences
Merge branch 'master' of github.com:neontribe/gbptm-ui

Conflicts:
	views/pages/preferences.html