Use config LDAP users and groups RDN instead of hardcoded values.
Merge remote-tracking branch 'origin/master' into use_conf_ldap_user_group_rdn
Error in variable name
update GN submodule
update GN submodule
update GN submodule
Update GN submodule.
mapfishapp - file upload mentions 2D only
Merge remote-tracking branch 'origin/13.09' into 14.01

Conflicts:
	analytics/src/main/webapp/js/lib/external/ext
	geonetwork
Merge branch '14.01'

Conflicts:
	geonetwork
Merge pull request #680 from georchestra/use_conf_ldap_user_group_rdn

Use config LDAP users and groups RDN instead of hardcoded values.
update GN submodule
security-proxy - ignores non HTTPS request check

The security-proxy can bypass CAS authentication in case of specific
user-agents and a HTTP basic-auth is provided. But the filter discards
requests that are not targetted onto https.

This adds an option to ignore if the request targets or not an HTTPS
server (anyway, the geOrchestra instances spread over multiple servers
should be bound over a trusted network, so the risk of sniffing
passwords *should* be mitigated).
Merge remote-tracking branch 'origin'
security-proxy - returns earlier in case of 403|404 error code (#506)

the Security-Proxy provides some specific JSPs for 403 and 404, but
before this commit, the proxified response for 403 / 404 were returned.

Forcing JSPs in case of 404 / 403 upstream responses.

Tested:
- locally
- on intra-test (Rennes Métropole)
GN: set default ui lang with shared.geonetwork.language
Merge remote-tracking branch 'origin/14.01'

Conflicts:
	geonetwork
Revert "GN: set default ui lang with shared.geonetwork.language"

This reverts commit 99a30316db6bc0473c326f717f250fb0f7bb8d57.
Add custom GEOR.XmlReader to fix IE10 issue with Ext.data.XmlReader
security-proxy - bumping to a new version of spring-security

The new version (3.1.x) introduces some extra classes that are
ActiveDirectory specific. Even if in the end I had to copy the entire
ActiveDirectory class, I think the shift could be useful in the future.

Tested on Rennes Métropole infrastructure.