final fixes and preparations for merge

resources/db_update_scripts/current.sql

@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS `Employee_countActiveFromDates` (
+  `Employee_id` bigint(20) NOT NULL,
+  `countActiveFromDates` datetime DEFAULT NULL,
+  `countActiveFromDates_KEY` bigint(20) NOT NULL,
+  PRIMARY KEY (`Employee_id`,`countActiveFromDates_KEY`),
+  KEY `FK5183E457A4585B4A` (`countActiveFromDates_KEY`),
+  KEY `FK5183E4575FCBC05F` (`Employee_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `Employee_countActiveFromDates`
+  ADD CONSTRAINT `FK5183E4575FCBC05F` FOREIGN KEY (`Employee_id`) REFERENCES `role` (`id`),
+  ADD CONSTRAINT `FK5183E457A4585B4A` FOREIGN KEY (`countActiveFromDates_KEY`) REFERENCES `project_class` (`id`);

src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java

@@ -240,6 +240,7 @@ public class AdminManageSupervisorPanel extends Panel {
 				@Override
 				public void onClick(AjaxRequestTarget target) {
 					supervisorDao.resetCountFromDate(projectClassDao.getProjectClass("BACHELOR"));
+					target.addComponent(container);
 				}
 			};
 			
@@ -251,6 +252,7 @@ public class AdminManageSupervisorPanel extends Panel {
 				@Override
 				public void onClick(AjaxRequestTarget target) {
 					supervisorDao.resetCountFromDate(projectClassDao.getProjectClass("MASTER"));
+					target.addComponent(container);
 				}
 			};
 			

src/main/resources/META-INF/persistence.xml

@@ -23,7 +23,7 @@
 				value="true" />
 			<property name="hibernate.generate_statistics" value="false" />
 			<!-- DEVELOPMENT VARIABLE, REMOVE FOR PRODUCTION USE -->
-			<property name="hibernate.hbm2ddl.auto" value="update" />
+<!-- 			<property name="hibernate.hbm2ddl.auto" value="update" /> -->
 			<!-- production settings database -->
 			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
 			<property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"></property>