Hotline#14919 Album Annee Edition

edition year should only be the one set in album data, not update date

Conflicts:
	VERSIONS

Demo Wip Valence

Dev#13881 Lekiosk

Rf15122 Champ Pseudo

Fix CAS 1.0 compatibility

Conflicts:
	application/modules/admin/controllers/UsergroupController.php
	library/Class/AdminVar.php
	library/Class/UserGroup.php
	tests/application/modules/admin/controllers/UserGroupControllerTest.php

 - Use builtin escape function instead of htmlspecialchars

Hotline#14869 Location Rule Forbid Value Equals Zero

rel #14869 : unimarc reader accepts fields with '0' value, reading emplacement with rule 995$6=0 under test

Dev #15141 Merge Agenda From Bron To Opac

Dev #14883 Multiple Fix For Valence

Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php

Dev #15141 Merge Agenda From Bron To Opac

Master

Master

Hotline 6.47

Hotline 6.47

Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php