Restructure preferences page
Facebook login complete
Fixed new preference page responsiveness problem
Merge branch 'facebook-login' into collab

Conflicts:
	app/scripts/app.js
	app/scripts/preferences/templates/preferences.hbs
	app/scripts/preferences/views/PreferencesView.js
Fixed bug with Facebook login