first part of 0015890
Merge branch 'master' of https://github.com/devicehive/devicehive-java