Had to touch autorization in web.xml
Merge origin/master