Updated pom in testBranch
updated pom from new branch
Merge branch 'testBranch'

Conflicts:
	pom.xml

Chose to keep the master branch's data.
Merge branch 'newBranch'

Conflicts:
	pom.xml

Kept the data from the newBranch