Changed to use settings for some values.
Merge branch 'master' of github.com:kenaaker/Sensor_Web

Fixed.