first commit
qMerge branch 'master' of https://github.com/niktrix/docker-tomcat7