application conf commits
Merge branch 'master' of https://github.com/avalliani/betareturn
added tomcat