update parameter in application.yml.sample
#14 api versioning
15-webapp-implement-jbuilder-and-handle-devise-failure
Merge branch '15-webapp-implement-jbuilder-and-handle-devise-failure' into integration

Conflicts:
	app/controllers/api/v1/sessions_controller.rb
	config/routes.rb