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