Merge pull request #85 from rickcarlino/master

Test Coverage Update
pulling things out into factories
Jasmine test runner config
Still configuring
Reverting controller changes until jasmine issue is resolved
Merge pull request #86 from rickcarlino/deviceService

Device service
Fixed Jasmine tests