UP-3984: Updating table to use datatables
UP-3987: Update table to use datatable
UP-3980: Updating edit-group(flow) viewGroupPermissions.jsp to use datatables and incorporating feedback
Merge pull request #238 from shawnconnolly/UP-3984

UP-3984: Updating Popular Portlets listPortlets.jsp to use datatables
Merge pull request #241 from shawnconnolly/UP-3987

UP-3987: Update SqlQuery results.jsp to use datatable
Merge pull request #249 from shawnconnolly/UP-3980

UP-3980: Updating edit-group(flow) viewGroupPermissions.jsp to use datatables
UP-3922 included latest pre-1.5.0 infusion build
UP-3922 Fixing gallery display and adding conflict resolution js files

Conflicts:
	uportal-war/src/main/webapp/media/skins/respondr/common/common_skin.xml
	uportal-war/src/main/webapp/media/skins/universality/common/common_skin.xml
UP-3922 Use Fluid 1.5.0