api init
gem 'active_model_serializers'
fb
Merge branch 'master' into api

Conflicts:
	config/routes.rb
signup, login, logout native
Merge branch 'master' into searchkick