Restructured views, fixed listener-reference in web.xml
Merge origin/master