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

Conflicts:
	modeles/support.class.php