Merge branch 'master' into branch1

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
where r u
--------------------
999999999)))))))))
7777777777777
commmit r
Merge remote-tracking branch 'origin/master'
adding simple text
==================
Merge branch 'master' into branch1

Conflicts:
	Testing1/src/main/webapp/index.jsp
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties