New Auth code changes
Fix grunt swagger tools package
Update to use new user service