MUMMNG-409
UP-3811 Add merging person dir DAO and clarify docs

Don't want to add custom attribute sources to the list of DAOs in
the cascading DAO. I.e. the existing comments in
personDirectoryContext.xml gave one the wrong idea.

This commit wraps the cascading DAO in a merging DAO and updates
comments to strongly suggest adding custom sources to the latter
rather than the former.

This is a cherry-pick and re-word of
67612e9794051fc3cfa7d0303f6b85b8a140fd9c from ssp-master.
Updating Backgrounds Portlet Preference to have methods for thumbnails
Adding UI changes for Background Preferences Portlet
UP-3841, UP-3842 : Adding Background Preferences thumbnails and configuration
Merge pull request #164 from dmccallum/UP-3811-merging-vs-cascading-pd-daos

UP-3811 Add merging person dir DAO and clarify docs
Merge branch 'master' of github.com:UW-Madison-DoIT/uPortal

Conflicts:
	pom.xml
UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
Merge pull request #172 from shawnconnolly/UP-3825-UPDATE

UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
UP-3799 - Upgraded weather portlet version
NOJIRA : Fix issue with master branch on local. Merge remote-tracking branch 'origin/master'
UP-3817 (partial) Add Fluid to Respondr for admin portlets
UP-3792: Adding functional add tab button
Merge pull request #173 from shawnconnolly/UP-3792

UP-3792: Adding functional add tab button to Respondr
UP-3792:  Change 'Add Tab' text into icon-plus-sign (Font Awesome) -- with 'Add Tab' as a mouseover -- because the text alone looks too much like another tab
NOJIRA:  Fix a 404 in the Respondr skin
UP-3817 admin portlets
UP-3817 Admin portlets
NOJIRA Mobile theme uses Respondr (for now at least)