Resolve conflicts
Resolve conflicts
jpmassiveresourceloader - porting to 3.3.1
Fixed jpmyportalplus
Fixfacetnav
Fix jpshowletreplicator
fix jpcontentfeedback
Deletion of Eclipse project files
Eclipse project file removal
cleanings
Resolve conflicts
Resolve conflicts
Resolve conflicts
Page manager package reverted to its original value
Upgrade Struts2 version (2.3.15.1)
License upgrade
Version update