Merge branch 'hotfix_manager_service' into develop

src/main/ui/static/config/managers/templates/modify.html

@@ -60,7 +60,7 @@
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.finacial" name="finacial">Accountant
                         </label>
-                        <label ng-if="('00001'|withRole) && !manager.admin && !manager.operator">
+                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.servant" name="servant">Service
                         </label>
                         <label ng-if="!manager.admin && !manager.operator">