return auth block in serializer
test to ensure session_controller returns auth block
add user_id to user serializer
add subscription to user serializer as class method
Merge branch 'master' into auth-fix-rb

Conflicts:
	app/serializers/user_serializer.rb
fixing merge typo
Merge pull request #94 from cremalab/auth-fix-rb

Fix Auth