UP-4132:  PortletDescriptor.isIsFramework() may return null and cause NPE
Fixes bug if all mktplce screenshot urls are bad

If all screenshot urls when invoked do not return
200 response codes for a portlet, the page will
no longer throw an exception.
MUMUP-895 : fix remove so that it doesn't refresh the page
MUMUP-895 : Adjust XSLT to actually check if you can remove a portlet
Merge pull request #337 from Jasig/noScreenshotsForYou

Address zero viable of multiple attempted screenshots bug.
MUMUP-896 : Add 'add to favorites' to marketplace Go button menu

Conflicts:
	uportal-war/src/main/resources/properties/i18n/Messages.properties
	uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp
Merge pull request #338 from timlevett/remove_portlet_bugfix_master

UP-3950 : Remove portlet bugfix
Merge pull request #340 from timlevett/add_portlet_to_favorite_in_marketplace

MUMUP-896 : Add 'add to favorites' to marketplace Go button menu
CMSPLT-36 Add validation query to SimpleContentManager overlay
NOJIRA update SimpleContentPortlet to 1.0.9
UP-4008 / IP:65: Reapplied Universality functionality to Respondr