Tiny change where I saw a getter used in one place but not another equivalent one
Fix phpunit, and the tests that were failing
Merge branch 'master' of github.com:joindin/joindin-web2 into tidyup-attendee-string

Conflicts:
	app/Joindin/Model/Event.php
Merge pull request #58 from clairs/tidyup-attendee-string

Tidyup attendee string
Merge branch 'master' of GitHub:joindin/joindin-web2 into clairs-phpunit-fix

Conflicts:
	app/Joindin/Controller/Event.php
adding an instruction for phing to run the phpunit tests when building web2