Merge branch 'develop' of gitlab.nibio.no:VIPS/VIPSCommon into develop

src/main/java/no/nibio/vips/entity/WeatherObservation.java

@@ -35,6 +35,7 @@ import javax.json.bind.annotation.JsonbDateFormat;
 public class WeatherObservation implements Comparable{
     
     public final static Integer LOG_INTERVAL_ID_1M = 8;
+    public final static Integer LOG_INTERVAL_ID_5M = 9;
     public final static Integer LOG_INTERVAL_ID_10M = 6;
     public final static Integer LOG_INTERVAL_ID_15M = 5;
     public final static Integer LOG_INTERVAL_ID_30M = 4;