Merge branch 'develop' of github.com:sdbmich1/plumboard
updated user controller to add js format and eager loading; updated api_keys.yml for test server
Merge branch 'issue-003' into develop