Don't make the search on principal user until 3 chars are entered, and define a timeout on ajax search
Solve Issue when adding new portlet and when portlets in list as a display name containing a simple quote
Upgraded maven-release-plugin to version 2.4.1

Conflicts:
	pom.xml
UP-3710 Fix create/update of quarter details

Only delete quarter details from DB if they have actually changed
UP-3712 Fix term detail to only delete/update if needed
UP-3711 Merge cache manages to allow replication messages

Conflicts:
	uportal-war/.gitignore
	uportal-war/src/main/resources/properties/ehcache.xml

Conflicts:
	uportal-war/.gitignore
UP-3713 Purge empty portal cookies
UP-3713 Fix broken unit test
UP-3713 log more info about portlet cookie expiration
UP-3713 Fix empty cookie expiration date calc
UP-3712 Fix term data import
UP-3738 Fix resourceId for delegate URLs
UP-3739 Fix config mode check for framework portlets
UP-3746 Analytics configuration UI

backbone based configuration UI for setting up google analytics properties
and dimensions

Conflicts:
	pom.xml
	uportal-war/.gitignore
	uportal-war/src/main/resources/layout/structure/columns/columns.xsl
	uportal-war/src/main/webapp/WEB-INF/portlet.xml
	uportal-war/src/test/java/org/jasig/portal/events/JpaAuditedPortalEventStoreTest.java

Conflicts:
	pom.xml
	uportal-war/.gitignore
UP-3747
MUMUP-143 Add uPortal analytics script

Sets dimensions
Reports tab/portlet renders & timings
MUMUP-143 Fix error when config is missing
MUMUP-145 Add flyout link event tracking
UP-3740 Update to Jackson 2.2

Conflicts:
	uportal-war/.gitignore
	uportal-war/src/main/java/edu/wisc/my/portlets/search/people/PeopleSearchService.java
	uportal-war/src/main/java/org/jasig/portal/events/handlers/db/JpaAuditablePortalEventDaoImpl.java
	uportal-war/src/test/java/edu/wisc/my/portlets/search/people/PeopleSearchServiceTest.java
	uportal-war/src/test/java/org/jasig/portal/events/JpaAuditedPortalEventStoreTest.java

Conflicts:
	uportal-war/pom.xml
UP-3748

Conflicts:
	uportal-war/src/main/resources/layout/theme/universality/content.xsl