Added logo and moved the override-web.xml entries that should actually be in the web.xml