event detail page
Merge branch 'master' of https://github.com/jberthiaume/bActiv

Conflicts:
	App/app/views/eventDetail.xml