Change pom.xml to recognize the parent Pom
Merge branch 'develop'