major changes
Merge branch 'master' of https://github.com/alfoeternia/ndi2013

Conflicts:
	src/Znieh/PartyBundle/Controller/EventController.php