"testing mergetool"
"testing mergetool"
"resolved the conflicts"
Merge branch 'master' of https://github.com/rokumar7/trial

Conflicts:
	ActorMessagingExample/pom.xml