Updated pom for distribution management settings. Directly uploading war
to trelta tomcat
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml