Resolve conflicts
Resolve conflicts
Resolve conflicts
Table showletcatalog refactored to widgetcatalog
ShowletConfig refactored to WidgetConfig
Resolve conflicts
Resolve conflicts
Resolve conflicts
Fix content feedback
Resolve conflicts
Upgrade "Avatar" plugin after insertion of user profile management into entando core
Upgrade "Content Workflow" plugin after insertion of user profile management into entando core
Resolve conflicts
Resolve conflicts
Resolve conflicts
Improve LDAP Connector plugins. Add "search usernames" methods
Improve LDAP Connector plugins. Add hookpoint jack for "User list" GUI
Remove wrong javadoc
Refactoring after insertion of user profile management into entando core
fix problem with multiple internalservlet in the same page and result with type redirect