Merge branch 'calendar-reporting' into staging
Merge branch 'calendar-reporting' into staging
Merge branch 'calendar-reporting' into staging
Merge branch 'calendar-reporting' into staging
Add toggle to show all employees on calendar
Merge pull request #144 from Orasi/staging-two

Add toggle to show all employees on calendar and legend for pending vacations
Fix for #145
Fix for #145
Merge branch 'staging' of github.com:Orasi/blue-source into staging

Conflicts:
	app/controllers/calendar_controller.rb
More fixes for #145
Fixed an issue where page number was not retained on sort