MUMUP-680 : Upgrade to the latest bootstrap
Stop aborting build on JDK 8.
UP-4035 - Removed lines that were accidently re-added
Merge pull request #282 from mindblender/UP-4035-patch

UP-4035 - Removed lines that were accidently re-added
UP-4038 : fix http redirect for sonatype snapshot repo
Merge pull request #283 from Jasig/sonatype_redirect_http_to_https

UP-4038 : fix http redirect for sonatype snapshot repo
NOJIRA:  Provide a missing (but natural) method overload allowing clients of the IPortalSpELService to specify a ParserContext
Merge pull request #278 from Jasig/bootstrap_3_1_1_upgrade_master

Upgrade to  Resource Server 1.0.38 and Bootstrap 3.1.1.
UP-4030:  Initial merge of work to convert definition of PAGS groups from XML file to JPA-managed entities;  this delta is feature complete;  there have been 4 sets of eyes (min) and 3 sets of hands on this solution to date;  there's room for refactoring and improvements, but it has reached a point where it's ready to be included;  currently the new strategy is DISABLED by default (legacy strategy is enabled), but we should revisit that choice before the 4.1 release
Add Basic Portlet marketplace

Remove env specific url
Add Marketplace entry page with screenshot prototype

Remove un-needed js file

Change the stock photo to stock photo
Adds ability for marketplace entries to appear in search

Defaults to show regular registry results not marketplace results

Toggle Comments in servicesContext.xml to swap the two results
In mp search out old reg

Takes out the standard registry search and adds
in specific marketplace search
Enables mulitple screenshots to be used
Adds links to mktplce entry page for Go buttons

The go buttons allow the user to use the portlets without
having to add the portlet to their layout or add the
portlet to favorites
MUMUP-537 : Changed get to details and moved some static text to message bundle
MUMUP-537 : Added link to title
MUMUP-539 : Removed version number from existence. Redesigned the objects and such to be focused on the release notes.

Conflicts:
	uportal-war/src/main/data/default_entities/portlet-definition/portletmarketplace.portlet-definition.xml
	uportal-war/src/main/java/org/jasig/portal/portlets/marketplace/MarketplacePortletDefinition.java
	uportal-war/src/main/java/org/jasig/portal/portlets/marketplace/MarketplaceSearchService.java
	uportal-war/src/main/java/org/jasig/portal/portlets/marketplace/PortletReleaseNotes.java
	uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/entry.jsp
MUMUP-546 : Added functionality to link to...
MUMUP-546 : Clean up js so if release notes doesn't exist it doesn't break