updated ant file to deploy executable project into tomcat dir
Merge remote-tracking branch 'origin/master'

Conflicts:
	ant/build.xml