Object Orient calendar view
Merge branch 'master' of https://github.com/RobertCorey/shift-bid

Conflicts:
	employeeCalendarView.php
	php/global.php