cf push
Merge branch 'master' of https://github.com/biscmar/swisscom-IoT-php

Conflicts:
	api.php