Merge branch 'master' of /Users/blond/Documents/PhpstormProjects/exafab with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/jquery.tablesorter.pager.js
Modif MEP