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