Added java7
Added tomcat8