using currentUser from application instead of from erb
working on removing closed help desk jbuilder, failing test
Fixed some help desk tests
finished tests
Merge branch 'master' into 1478
syntax error;closes #1478
assert length and remove default issue status
working on tests with multiple query params
fixing controller api
other user not user
Merge branch 'master' into 1478
singularize services
Merge pull request #1504 from affektive/1478

#1478
Merge pull request #1510 from affektive/notifications

Removed old mailers and pages...
Merge branch 'master' of github.com:duffcodester/digiquatics into 1429

Conflicts:
	app/assets/javascripts/controllers/admin/certifications.js.coffee
	app/views/layouts/application.html.erb
Trying to implement on Time Off
Refactored ng-init current user to use Application.currentUser
Refactoring of location and search directives throughout app
Fixed all locations drop down closes #1358
Fix for teaspoon test for shifts on codeship