Json policy: duplicated code is removed
Merge branch 'master' of https://github.com/devicehive/devicehive-java
dao refactoring
Merge remote-tracking branch 'remotes/origin/master'