dev file
Merge branch 'master' of github.com:SensorServicePlatform/APIs