updating ant and tomcat
merged