modify template showEvent
modif event
show event OK
Merge branch 'Naty'
Merge branch 'master' into Naty
Merge branch 'Clélia' into Naty

Conflicts:
	MVC/index.html
artist list
Merge branch 'Naty' into Clélia