updated template file

Conflicts:
	app/views/manifestations/_manifestation.html.erb
Merge branch 'master' of github.com:next-l/enju_biblio