updated pom.xml
merging 'feature/SS-01' into develop