Path refactoring *showlets to *widgets
Resolve conflicts
Fix test bundle-content-announcement
Widget JSPs moved to the proper place
bump version to 3.3.1-SNAPSHOT