refactoring shifts
Merge branch 'master' into 1081
wip on refactoring
Cleaning up code.
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