application-context and web.xml

Change-Id: Ib52081d3ab73630218d9f2133ae4daef2c92b0a6