Category action bean + web pages
Merge origin/master