pulling userjam data from service via $q.defer.promose object and resolving promose izn the controller to get results of http request
unit testing the promise in the userservice and adding in the bumf to get the user obiject into the controller
fixing broke ass navigation
Merge branch 'develop' into feature/ui-router
adding the routes so they pap in the templates and load the right controller when the routes change