edited pom.xml
Merge branch 'feature-connectToDB' into dev

Conflicts:
	.idea/workspace.xml
changes pom.xml
no message
empty