mycore-1.1.2 specifics
Merge branch 'master' of https://github.com/CNRS-DSI-Dev/mycore_wayf

Conflicts:
	IDProvider.conf.php
	js/embeddedWAYF.js