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

Conflicts:
	src/main/webapp/app/navigation.zul

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -87,6 +87,9 @@ UsersGridColumnSureName=Příjmení
 AgendaMaterial=Materiál
 MaterialFormTitle=Materiál
 
+AgendaWorkgroups=Pracovní skupiny
+WorkgroupFormTitle=Pracvní skupina
+
 ButtonStorno=Storno
 ButtonSave=Uložit
 

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -124,6 +124,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="commissionDao" class="info.bukova.isspst.dao.jpa.WorkgroupDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -180,5 +184,10 @@
 		<property name="dao" ref="materialDao"/>
 		<property name="validator" ref="validator"/>
 	</bean>
+	
+	<bean id="workgroupService" class="info.bukova.isspst.services.workgroups.WorkgroupServiceImpl">
+		<property name="dao" ref="commissionDao"/>
+		<property name="validator" ref="validator"/>
+	</bean>
 		
 </beans>