Implemented Contact Preferences
Merge branch 'contactprefs' into wip

Conflicts:
	app/views/pages/preferences.html.erb
Merge branch 'wip' of https://github.com/tmcyf/tmcyf into wip