Merge branch 'stable-develop' of github.com:geonetwork/core-geonetwork into springmvc

Conflicts:
	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork.js
	web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js
	web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
	web/src/main/java/org/fao/geonet/Geonetwork.java
Merge branch 'develop' of github.com:geonetwork/core-geonetwork into springmvc

Conflicts:
	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork.js
	web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js
	web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
	web/src/main/java/org/fao/geonet/Geonetwork.java
Fixing some small complation bugs
Revert "Revert "Spring MVC""

This reverts commit 0a62a4e2da7038b1ca86bad9d019dbee04718ff1.

Conflicts:
	maven_repo
	web/src/main/java/org/fao/geonet/Geonetwork.java
Revert "Remove marc4j dependency, use mockito-all."

This reverts commit 474d7349bad66be4ebbba5685f1efac77569e655.
Adding check before rollback. Some errors where due to try to rollback an already rolledback transaction
Removing un-autowirable ServiceContext
If it is a multipart, urlrewrite does not work ok. So we will not redirect those calls.
Port to SMVC the upload logo service
Merge remote-tracking branch 'origin/stable-develop' into springmvc

Conflicts:
	web/src/main/webapp/WEB-INF/config-spring-geonetwork.xml
Fixing bad merge: duplicated bean
Changing format parameter with _content_type
Changing Jeeves to accept _content_type as parameter. Search service ignores the parameter
Merge remote-tracking branch 'origin/develop' into springmvc

Conflicts:
	web/src/main/webapp/WEB-INF/config-spring-geonetwork.xml
Merge remote-tracking branch 'origin/develop' into springmvc

Conflicts:
	core/src/main/java/org/fao/geonet/kernel/search/index/LuceneIndexLanguageTracker.java
	web/pom.xml
Merge pull request #602 from geonetwork/springmvc

Springmvc