Merge pull request #6 from fishplate/2_api_controllers

2 api controllers
Merge branch 'master' into 3_active_admin