Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/resources/hibernate.cfg.xml

src/main/webapp/admin/permissions/permForm.zul

@@ -5,8 +5,8 @@
 	<caption zclass="form-caption" label="${labels.AgendaRights}" />
 	<label value="@load(vm.dataBean.description)" style="font-weight: bold;"/>
 	<hbox>
-			<checkbox label="Práva pracovních skupin" checked="@bind(vm.dataBean.workgroup)"/>
-			<checkbox label="Práva středisek" checked="@bind(vm.dataBean.centre)"/>
+			<checkbox label="${labels.WorkgroupFunction}" checked="@bind(vm.dataBean.workgroup)"/>
+			<checkbox label="${labels.CentreFunction}" checked="@bind(vm.dataBean.centre)"/>
 		</hbox>
 	
 	<vbox children="@load(vm.modules)" width="730px">