Merge branch 'devel' into 'weather_stuff'

# Conflicts:
#   src/main/java/ch/hepia/api/transport/Coordinates.java
#   src/main/java/ch/hepia/api/transport/Location.java