Merge branch 'master' of https://github.com/boyeborg/IPA-SMMDB
Merge branch 'master' of https://github.com/boyeborg/IPA-SMMDB into javabackend