clean up configuration
Merge branch 'develop' of https://github.com/ridoo/SensorWebClient.git into develop