updated services to return 2 functions for our different API endpoints
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop