ezlm,omez,vm
Merge branch 'master' of https://github.com/Azurix78/RMS

Conflicts:
	app/View/Medias/admin_add.ctp