merge pom.xml

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/razvansr/myproject1