Not final cinematheque
Not final cinematheque 2
Not final cinematheque 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions.php
	inc/cinematheque.inc.php
	public/js/mediasphere_cinematheque.js
Not fianl cinematheque 4