updated version of tomcat to last 6x version (6.0.37)

See
http://apache.mirrors.pair.com/tomcat/tomcat-6/
clean up conflict