Minor changes involving display and some code improvements
Merge branch 'master' of https://github.com/devashishshankar/Trooper
Merge https://github.com/regunathb/Trooper

Conflicts:
	batch-core/src/main/resources/packaged/common-batch-server-nature-config.xml