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.
Merge remote-tracking branch 'origin/master' into ldapadmin

Conflicts:
	geonetwork
	mapfishapp/src/main/webapp/app/js/GEOR_Lang/de.js
	mapfishapp/src/main/webapp/app/js/GEOR_Lang/es.js
	mapfishapp/src/main/webapp/app/js/GEOR_Lang/fr.js
	mapfishapp/src/main/webapp/app/js/GEOR_Lang/ru.js
	mapfishapp/src/main/webapp/app/js/GEOR_fileupload.js