Merge branch 'master' of https://github.com/infobrixGit/javarest-service

Merge branch 'master' of https://github.com/infobrixGit/javarest-service #2