Update fluid, jquery, jqueryui and fix conflicts
Merge pull request #1 from auxepaul/CMSPLT-22

CMSPLT-22 : Update resource-server, CKEditor, jquery, fluid, uportal-search-api