re-do
format changes, on hold checkbox bug fix, only calculate hours for job that aren't on hold
admin can look at Leave Request report.
Merge branch 'master' of github.com:gcziprusz/nexhibit

Conflicts:
	app/controllers/users_controller.rb