Filter working
Merge branch 'master' of https://github.com/Baltha/E09-PHP

Conflicts:
	app/Models/App_model.php
Push for tanguy