[Master] Fix inclusion bug
Merge branch 'master' of https://github.com/isaacd9/gipsydanger

Conflicts:
	Symfony/src/gipsydanger/peopleBundle/Resources/views/join/join.html.twig