Merge pull request #967 from rustyswayne/1.5.1

Starts wiring up the ApiController.