Merge commit '17f5d88' into feature/testFeature
Merge branch 'feature/testFeature' into develop
Merge branch 'develop' of https://github.com/devgate/SpringWebService into develop