Fixed references to services in controller
Merge branch 'dev' of https://github.com/jsicree/joe-on-tech into dev