Merge remote-tracking branch 'origin/master'

Conflicts:
	bankmodel-ear/target/m2e-wtp/ear-resources/META-INF/maven/com.epam.cdp/bankmodel-ear/pom.properties
Merge remote-tracking branch 'origin/master'