UP-3662: Provide a PAGS regex tester that does not require a match on the whole region
UP-3654:  Merging fix submitted by jameswennmacher in pull request #113, plus a couple tweaks
UP-3654:  Swich from the short-lived uPdata plugin to the consolidated uportal-maven-plugin
UP-3654:  Fix build errors that cropped up from this effort (bundled CalendarPortlet)
UP-3664:  Bookmarks uwfn.tld apparently doesn't load on Tomcat7
Updated javadocs, added unit tests.
Merge pull request #115 from mmoayyed/UP-3662

UP-3662: Provide a PAGS regex tester that does not require a match on the whole region
UP-3670 Fix data-import build options

Pass valid args to maven command
Use filters file for database config
UP-3668 Allow aggregator to inspect event

Add API to allow aggregator to determine if it supports aggregation of the actual
event instead of just the event type
Fix bad class name reference in docs
UP-3669 Reduce potential sources of flushing

During event aggregation no event flushing should occure, this change
should prevent any hibernate data flush until the aggregation block
is complete
NOJIRA: Implement Portal Activity portlet to display information regarding who is using the portal and what the popular search terms are.
NOJIRA: Remove log appender that was added for testing purposes.
UP-3671:  Create a new Portal Activity framework portlet that shows some basic info about current users, logins, and searches
NOJIRA:  The hsql driver jar from the BookmarksPortlet overlay was not being properly excluded (oddly);  tweaking the config slightly to make it work
UP-3663 Add support for import of archive files

    MediaType and resolution and archive processing

    Resolves the media type of the imported file and then wraps it in the correct
    archive/compress input stream handler.
UP-3673 Add logging config for calendar portlet
UP-3660 Allow editing of all attributes

Person Directory may not know about all possible attributes, allow
editing of any user attribute
UP-3675: Add a portlet definition for the Attachments portlet to the default entities and modify the all-lo.fragment-layout.xml in the quickstart to include the portlet as a hidden element in the header.
Merge branch 'master' of github.com:Jasig/uPortal