using currentUser from application instead of from erb
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
Attempt to fix teaspoon test on codeship
adding docs around using prod db locally
dayIndex bug on codeship
removed console log
log daya
remove console log
Locked angular at 1.3.0
Locked angular attempt 2
Converting pages to have default location
Attempt to fix sub requests filtering
Fixed bugs on select box
fixed Application currentLocation bug in specs
removed partials only used once