refactoring shifts
Merge branch 'master' into 1081
wip on refactoring
Cleaning up code.
Implementing badges.
Merge branch 'master' of github.com:duffcodester/digiquatics into badge-notifications
Badge logic if zero
Updated rake task.
Notifications.
Merge pull request #1135 from affektive/badge-notifications

Badge notifications
Merge branch '1081' of github.com:duffcodester/digiquatics

Conflicts:
	app/assets/javascripts/controllers/scheduling/shifts.js.coffee
Merge pull request #1143 from affektive/1081

1081
Removed model validation closes #1150, Adde created at on time off index closes #1149 and added clock on my schedule page closes #1148.
Fixed failing test.
Merge pull request #1151 from affektive/ui_fixe

Ui fixes and customer requests
merge conflicts