minor
Merge branch 'BRANCH-1-2' of https://github.com/devicehive/devicehive-java into BRANCH-1-2