MERGE from BRANCH-1-2
Merge branch 'BRANCH-1-2'
Merge branch 'master' of https://github.com/devicehive/devicehive-java