remove iotcon berlin
Merge branch 'master' into java-benjamin