Fix phpunit, and the tests that were failing
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