Merge branch 'develop' into frontend/timo

src/main/java/hhn/labsw/bugageocaching/entities/Station.java

@@ -15,6 +15,7 @@ public class Station {
   private double longitude;
   private double lattitude;
   private int code;
+  private String solution;
 
   public Station() {
   }
@@ -58,4 +59,12 @@ public class Station {
   public void setCode(int code) {
     this.code = code;
   }
+
+  public String getSolution() {
+    return solution;
+  }
+
+  public void setSolution(String solution) {
+    this.solution = solution;
+  }
 }

src/main/resources/application.properties

@@ -2,4 +2,5 @@ spring.datasource.url=jdbc:mariadb://seserver.se.hs-heilbronn.de:3406/buga19Geoc
 spring.datasource.username=BuGa19GeocachingUser
 spring.datasource.password=GeocachingPw
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true