v7
Merge branch 'master' of https://github.com/OfunEx/appMediatheque

Conflicts:
	modeles/link.class.php