Small fixes fro web app
Merge branch 'master' into feature/weather_station_sensors