Fix for Ticket #996
Cleanup headers to avoid duplicate loading of the same headers.
Duplicate loading of the protocol.js was causing ie7 to fail.
ISO19139 / french documentation / typo.
Editor / Helper / Conditional helper (#1220) - properly get helper.
Merge branch 'master' of https://github.com/ianwallen/core-geonetwork
Fix for ticket #1199
better detection of apppath and config path when running in jetty with multiple locations
add overrides that update the spring application context
login will now redirect back to same page that login was made from

fixed bug with xml cache
fixed regression with XmlFileCache
fix for withheld elements

some extra checks to make sure only editors can update metadata
Add geoportal REST harvester

Conflicts:

	web/src/main/webapp/loc/fre/xml/harvesting.xml
Ensure gmd prefix xslt works for records with prefix and without
fixed accidental import
rename TestBean to not have Test in name so maven 2 doesn't think it is a test
changed lucene to official 4.1 release
fixed lucene version
reverted version until I get compile errors fixed.  I didn't realize it had an API change
changed lucene to official 4.1 release
reduce instance size of CatalogSearcher
fixed lucene version