rouli
Merge branch 'master' of https://github.com/roulili/iteachyou

Conflicts:
	Modeles/recordings.php
	Vues/js/ajax.js
bugfix bourrins rouli
Merge branch 'master' of https://github.com/roulili/iteachyou