Merge branch 'rc/ivan' into feature/consolidateBeverageItems
Added new key and csr for central01
Added the ability for Supervisor to send messages to users in any department.
Merge pull request #372 from acres4/feature/RemoveSnapToCallTab

Removed the automatic snap to calls tab on call acceptance
Kai Beverage - now checking for duplicate drinks in an employees fired orders, the label will now read 3x Bud light" when duplicates exist
Removed the need for a flag to use a permission ion mercury instead.
Supervisor - Status - DashboardSuperFooterView was replacing a popover controller without dismissing an already active one
Adding a new permission for supervisor
Merge pull request #375 from acres4/feature/statsReplacePopoverCrash

Yet another stats popover crash.  

This is becoming another "text yourself" issue.
Merge pull request #374 from acres4/feature/SupervisorMessagingAllDepartments

Supervisor messaging all departments
Supervisor - resolved compile issue
Merge pull request #376 from acres4/feature/userSelectorBuildIssue

Supervisor - resolved compile issue
Merge branch 'master' into feature/masterUpdate

Conflicts:
	ios/Supervisor/Supervisor/EmployeeList.m
Merge pull request #378 from acres4/feature/masterUpdate

Update rc/ivan with master
Kai Beverage - changed the label methods back to taking a DrinkItem object instead of the drink id, other changes related to the BeverageDrink to BartenderDrink change
Kai Beverage - added ability to complete duplicate drinks
Kai Beverage - added the server name to the beverage order detail view
Supervisor - Status - first steps toward yet another refactor of our collection view/tables
Supervisor - Status - new collection view now pushes the old off screen
Supervisor - Status - fixed background color of collection view