Stubbed out some API endpoints
Merge branch 'master' into dev