fix app/controllers/v1/api_controller.rb
Merge branch 'devel' into deploy_v1