Scaffolded the basic files
Added notifier message
Fixed user serializer
Fixed login
Added scaffold comments to the code
Added model for notification settings and controller
Got the notifications controller to work
Added the message to votes and ideas
nested routes for Activities
return auth block in serializer
test to ensure session_controller returns auth block
Merge branch 'auth-fix-rb' into activity-optimization-rb
add user_id to user serializer
Merge branch 'auth-fix-rb' into activity-optimization-rb
Wrote notifiers and fixed test
Commented out the emails so I can merge fixes to master
Merge current mail branch
Merge branch 'master' into activity-optimization-rb

Conflicts:
	app/serializers/user_serializer.rb
add subscription to user serializer as class method
Merge branch 'master' into auth-fix-rb

Conflicts:
	app/serializers/user_serializer.rb