Started adding servletcontextlistener
Merge origin/master