UP-3625 Initial working implementation; need feedback on what report should look like
UP-3625 Added discriminator hierarchy to allow for multiple tabs to be selected

Columns can now be a set of group/tab combinations allowing a user to select a single group and multiple tabs or multiple groups and multiple tabs.
UP-3625 Created default method for obtaining report column discriminator map that can be used by classes that don't add additional column criteria to reports (e.g. groups + tabs)
UP-3628 Partial implementation - need to fix fname
UP-3628 Fixed issue with fname inconsistency
UP-3628 Changed PortletExecutionAggregationDao from ExecutionType to Set<ExecutionType> to allow selecting multiple execution types on report
UP-3628  Change the report title and column names based on field values (put in title if selected 1 of n possibilities) so column names are smaller. CSV and HTML report columns always display all column headers.
UP-3628 Fixed TabRender and PortletExecution report header/columns to vary properly based upon selections
UP-3628 Fixed PortletExecution report header/columns to vary properly based upon selections
Merge branch 'UP-3625' of git://github.com/jameswennmacher/uPortal into UP-3625
Merge branch 'UP-3628' of git://github.com/jameswennmacher/uPortal into 3628

Conflicts:
	uportal-war/src/main/resources/properties/i18n/Messages.properties
Pushing changes to temporary branch
UP-3631
Add statistic reporting for portlet adds, deletes and moves within user layouts.

Conflicts:
	uportal-war/src/main/java/org/jasig/portal/portlets/statistics/BaseStatisticsReportController.java
	uportal-war/src/main/java/org/jasig/portal/portlets/statistics/ConcurrentUsersStatisticsController.java
	uportal-war/src/main/java/org/jasig/portal/portlets/statistics/LoginTotalsStatisticsController.java
	uportal-war/src/main/java/org/jasig/portal/portlets/statistics/PortletExecutionStatisticsController.java
	uportal-war/src/main/java/org/jasig/portal/portlets/statistics/TabRenderStatisticsController.java
	uportal-war/src/main/resources/properties/i18n/Messages.properties