Commit after last debug - fianar
Merge branch 'njatoDebug' into Developpement

Conflicts:
	assets/css/AdminLTE.css