fixed calories not having a number when activeSlide is undefined
fixed calories not having a number when activeSlide is undefined
topBarController updated to account for 0
Merge branch 'cardaction' of https://github.com/sudostack/fittr into cardaction
add fitbit worker, protect angular routes, clean up code
fix: worker only queries users with fitbit
Merge pull request #33 from Hendrixer/server

add fitbit worker, protect angular routes, clean up code closes #18 fixed #32
adds title bar to signup-login template (closes #40).  adds error flash message to signup view.
removed unnecessary signup.html
refactored the various  calls within the UserService object into a http helper function (closes #35)
Merge branch 'master' of https://github.com/Fittr/fittr
Merge pull request #42 from stateoflux/master

Additional UI Changes On Signup/Login pages
corrected some bugs that caused issues with controllers interacting with the validation service.  time to write some tests.
fixed calories not having a number when activeSlide is undefined
topBarController updated to account for 0
little progress; just saving
Merge branch 'cardaction' of https://github.com/sudostack/fittr into cardaction

Conflicts:
	public/js/src/controllers/topBarController.js
- moved the test directory under public
- added tests to the UserService
- modified gruntfile to fix issue with client side tests not running
Merge branch 'master' of https://github.com/Fittr/fittr
Merge pull request #43 from stateoflux/master

Several changes related to client side testing