maj2
Merge branch 'master' of https://github.com/Azurix78/RMS

Conflicts:
	app/View/Layouts/admin_default.ctp