Edit Pom
Edit Pom
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	target/classes/META-INF/maven/SoftServe_Java-105_Project/SoftServe_Java-105/pom.properties