home
Merge remote-tracking branch 'origin/master'

Conflicts:

	target/m2e-wtp/web-resources/META-INF/maven/by.epam/News1/pom.properties