email preferences
hooks
Merge pull request #129 from ngoel36/email_pref

Email pref
change to after_create
Merge pull request #130 from ngoel36/email_pref

change to after_create
unsubscribe
Merge pull request #131 from ngoel36/email_pref

unsubscribe
authorize
Merge pull request #132 from ngoel36/login

authorize
add roles to users
make sure roles are correct type
serialize roles to array instead of json
Merge pull request #118 from lukesteensen/user-roles

add roles to users
letter_opener
Merge pull request #134 from ngoel36/letter_opener

letter_opener
share buttons
Merge pull request #135 from ngoel36/share

share buttons
Merge branch 'master' into cleanup

Conflicts:
	Gemfile
	app/controllers/comments_controller.rb
	app/controllers/reviews_controller.rb
	app/controllers/views_controller.rb