Merge branch 'rc/ivan' into feature/consolidateBeverageItems


Former-commit-id: 3ce3bbfd7d3e74c98ea2eaa9841031ce6ccde97e
Added new key and csr for central01


Former-commit-id: a5fbf262b83c3f03e58ffbce60116d2f2e8a5ed2
Added the ability for Supervisor to send messages to users in any department.


Former-commit-id: 7e7b1c1b18c389cbf342ae8d6b912bec5d51b162
Merge pull request #372 from acres4/feature/RemoveSnapToCallTab

Removed the automatic snap to calls tab on call acceptance

Former-commit-id: 3f9683652cfda889f66d06add2b25ba3c58af9f8
Kai Beverage - now checking for duplicate drinks in an employees fired orders, the label will now read 3x Bud light" when duplicates exist


Former-commit-id: 288a487f4b2925f8a9ebb0b19092dc390bfb7ae7
Removed the need for a flag to use a permission ion mercury instead.


Former-commit-id: a53d990e0051bc5df05338354be9d948c7546127
Supervisor - Status - DashboardSuperFooterView was replacing a popover controller without dismissing an already active one


Former-commit-id: 51468809543628bb11481879737e65d25f9b6ba1
Adding a new permission for supervisor


Former-commit-id: 199fa44725ecc26bcd5f43ac0476cbfda47a889a
Merge pull request #375 from acres4/feature/statsReplacePopoverCrash

Yet another stats popover crash.  

This is becoming another "text yourself" issue.

Former-commit-id: c36ee0da18f79a9a7ec7c2a221cb63d4c5d40159
Merge pull request #374 from acres4/feature/SupervisorMessagingAllDepartments

Supervisor messaging all departments

Former-commit-id: 68fb068a99952f290fe5d08b8347badf98459c7e
Supervisor - resolved compile issue


Former-commit-id: 7da8755b15c71f55e45c9bbe6f85852a12e54f40
Merge pull request #376 from acres4/feature/userSelectorBuildIssue

Supervisor - resolved compile issue

Former-commit-id: 4d72f877daf1b708851de16124c84b0b0ced7b1c
Merge branch 'master' into feature/masterUpdate

Conflicts:
	ios/Supervisor/Supervisor/EmployeeList.m

Former-commit-id: 77bdc2c47da8d31facf1815d1fab089855dd6a6b
Merge pull request #378 from acres4/feature/masterUpdate

Update rc/ivan with master

Former-commit-id: ddadb03efc977173f73859ec5d680252a505f461
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


Former-commit-id: 0ffb1ee4e2aa6ea807df27a663633d6a41e5ab52
Kai Beverage - added ability to complete duplicate drinks


Former-commit-id: 3ff30125aabaacc49075315b8ad8449fa71e0917
Kai Beverage - added the server name to the beverage order detail view


Former-commit-id: 4f005ce54b7bc6087152c0e28af9295ddcf94a6a
Supervisor - Status - first steps toward yet another refactor of our collection view/tables


Former-commit-id: 869f067ac5847120a59fd2633cbcde1cac413134
Supervisor - Status - new collection view now pushes the old off screen


Former-commit-id: 9a6298e0fe88830b0a676cf381c2f1b62eded834
Supervisor - Status - fixed background color of collection view


Former-commit-id: 30624728f44d7040498f9e1b2b591c15b10b3aba