fix
Merge branch 'dev' of https://github.com/Clementp57/eLycee into dev

Conflicts:
	app/controllers/BaseController.php
	public/js/factories/PostsFactory.js
resources working