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.