Merge branch 'master' into branch1

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
Merge remote-tracking branch 'origin/master'