Made server ready for deployment on tomcat 7.