insert 2 dev
Merge branch 'develop' of https://github.com/devgate/SpringWebService into develop