MUMUP-1388 : Adds keyword to marketplace entries

Conflicts:
	uportal-war/src/main/data/uw_quickstart_entities/portlet-definition/course-services.portlet-definition.xml
	uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/MarketplacePortletDefinition.java
Merge pull request #486 from timlevett/makretplace_keywords

UP-4351 : Add keywords to marketplace entries