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
UP-3678:  Update Apereo NotificationPortlet to v. 2.0.0
NOJIRA:  Notification overlay was only applying .properties files
UP-3678:  Update Apereo NotificationPortlet to v. 2.0.1
UP-3681:  Bump bundled NRP to 3.0.5, leverage import, and provide feeds for pre-configured news portlet with tabs
UP-3679:  Merging pull request #116, plus a couple modest tweaks
UP-3685 Fix potential infinate loop in dlm

Add duplicate node check when handling dlm positionSet data, if a
duplicate node is found an exception will be thrown describing the
infinite loop state.