added tomcat env variable
fixed merge issues