Editing UCOP FAQ and About pages
Fixing links on UCOP About page
Changing Google Analytics js in campus branded files
correcting links on UCOP About page
Adding support for DataUp EML xml
changing "campus" to "publisher"
Merge pull request #5 from CDLUC3/master

Weekly Fork Update CDL-2-UCI
Updating Policies and Upload Basics pages to include Dataone info
Removing Rights page
Fixing typo on Upload Basics page
New UC3 logo
Merge pull request #6 from CDLUC3/master

Weekly Fork Update CDL-2-UCI
Adding brand file, logo for LBNL to XTF
Adding LBL to queryRouter.xsl
Merge pull request #7 from CDLUC3/master

Weekly Fork Update CDL-2-UCI
Fix typo in LBNL brand xml file
Removing sort options from search results
Merge pull request #8 from CDLUC3/master

Weekly Fork Update CDL-2-UCI
Merge remote-tracking branch 'upstream/master' into browse-orangecounty

Resolved conflicts in:
	xtf/assets/assets.xml
	xtf/style/crossQuery/resultFormatter/common/resultFormatterCommon.xsl
	xtf/style/crossQuery/resultFormatter/default/resultFormatter.xsl
	xtf/style/textIndexer/common/preFilterCommon.xsl