Changed the messages for people attending an event
Merge branch 'JOINDIN-253' of github.com:EricHogue/joindin-web2 into JOINDIN-253

Conflicts:
	Controller/Application.php
	View/Application/_summary.html.twig
Move the attending string generation in the model
Escape the attending text
Fixed a typo
Fixed a typo
Merge branch 'JOINDIN-314-RemoveVMDocumentation' of github.com:EricHogue/joindin-web2 into JOINDIN-314-RemoveVMDocumentation
Merge pull request #13 from EricHogue/JOINDIN-253

JOINDIN-253 - Change the attending labels
Merge pull request #24 from EricHogue/JOINDIN-314-RemoveVMDocumentation

Fixed a typo.
Merge branch 'master' of github.com:clairs/joindin-web2

Conflicts:
	View/Application/_summary.html.twig