adapt to new location format

It was "location":"4.89,52.37" and now it is "location":{"lon":4.89,"lat":52.37}

Also some clean up.
Typo
Merge branch 'master' of github.com:EricssonResearch/iot-framework-engine into develop

Conflicts:
	.gitignore