Merge branch 'Fabrizio'
Merge branch 'Fabrizio'
Merge branch 'Fabrizio'
Merge branch 'Fabrizio'
Merge branch 'Fabrizio'
Merge remote-tracking branch 'origin/Romain' into Fabrizio

Conflicts:
	MMReadyDesign/css/application.css
	MMReadyDesign/less/application.less
	MMReadyDesign/less/listPimp.less
	MMReadyDesign/less/searchResult.less
	MMReadyDesign/showEvent.html
Merge branch 'Fabrizio'
event add

petites corrections
add event js
Merge branch 'master' of https://github.com/comem/mmready-test

Conflicts:
	MMReadyDesign/css/application.css
	MMReadyDesign/less/application.less
	MMReadyDesign/less/listPimp.less
	MMReadyDesign/less/searchResult.less
	MMReadyDesign/showEvent.html
	MVC/index.html
	MVC/js/main_Naty.js
resolve conflict merge