update to tomcat7
increased version to 1.9.6
added missing server-jk.xml
Merge branch 'tomcat7' into develop