diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1a83072..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 28 10:32:52 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/persistence/META-INF/persistence.xml b/persistence/META-INF/persistence.xml
index 4dbe35e..c964c6b 100644
--- a/persistence/META-INF/persistence.xml
+++ b/persistence/META-INF/persistence.xml
@@ -8,40 +8,27 @@
              
     <persistence-unit name="default">
     	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-    	<non-jta-data-source>java://comp/env/jdbc/BabydatenbankDS</non-jta-data-source>
     	<class>org.openxava.session.GalleryImage</class>
     	<class>org.openxava.web.editors.DiscussionComment</class>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="update"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL8Dialect" />
             <property name="javax.persistence.create-database-schemas" value="true"/> 
-            <property name="hibernate.default_schema" value="Babydatenbank"/>
+            <property name="hibernate.default_catalog" value="admin_babydatenbank"/>
             <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
         </properties>
     </persistence-unit>
     
-    <!-- MySQL  
-    <persistence-unit name="default">
-    	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-    	<non-jta-data-source>java://comp/env/jdbc/BabydatenbankDS</non-jta-data-source>
-    	<class>org.openxava.session.GalleryImage</class>
-    	<class>org.openxava.web.editors.DiscussionComment</class>
-        <properties>
-            <property name="javax.persistence.schema-generation.database.action" value="update"/>
-            <property name="javax.persistence.create-database-schemas" value="true"/> 
-            <property name="hibernate.default_catalog" value="Babydatenbank"/>
-            <property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
-        </properties>
-    </persistence-unit>     
-    -->   
-                
     <!-- JUnit Hypersonic -->
     <persistence-unit name="junit">
     	<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
     	<class>org.openxava.web.editors.DiscussionComment</class>
         <properties>
-			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
-			<property name="hibernate.default_schema" value="Babydatenbank"/>
-			<property name="hibernate.connection.url" value="jdbc:hsqldb:hsql://localhost:1666"/>
+			<property name="hibernate.connection.driver_class" 	value="com.mysql.jdbc.Driver"/>
+			<property name="hibernate.dialect"					value="org.hibernate.dialect.MySQL8Dialect" />
+			<property name="hibernate.connection.username"		value="babydatenbank_usr" />
+			<property name="hibernate.connection.password"		value="mJq63*n1" />
+			<property name="hibernate.connection.url" 			value="jdbc:mysql://localhost:3306/admin_babydatenbank"/>
         </properties>
     </persistence-unit>    
     
diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml
index 720c1b7..6af556a 100644
--- a/web/META-INF/context.xml
+++ b/web/META-INF/context.xml
@@ -19,18 +19,17 @@
 		Right button on your project > Properties > Java Build Path > Libraries
 	-->
 	 
-	<!-- HSQLDB -->   	
+	<!-- HSQLDB   	
     <Resource name="jdbc/BabydatenbankDS" auth="Container" type="javax.sql.DataSource"
 	      maxTotal="20" maxIdle="5" maxWaitMillis="10000"
 	      username="sa" password="" driverClassName="org.hsqldb.jdbcDriver"
 	      url="jdbc:hsqldb:hsql://localhost:1666"/>
-	      
-	<!-- MySQL       
+	      -->
+	<!-- MySQL -->      
     <Resource name="jdbc/BabydatenbankDS" auth="Container" type="javax.sql.DataSource"
 	      maxTotal="20" maxIdle="5" maxWaitMillis="10000"
-	      username="root" password="" driverClassName="com.mysql.jdbc.Driver"
-	      url="jdbc:mysql://localhost:3306/"/>	      
-	-->      
+	      username="babydatenbank_usr" password="mJq63*n1" driverClassName="com.mysql.jdbc.Driver"
+	      url="jdbc:mysql://localhost:3306/admin_babydatenbank"/>	      
 	
 	<!-- PostgreSQL 
 	<Resource name="jdbc/BabydatenbankDS" auth="Container" type="javax.sql.DataSource"