[Master] Fixed template extension in join and begun schema.xml
Merge branch 'master' of https://github.com/isaacd9/gipsydanger

Conflicts:
	Symfony/src/gipsydanger/peopleBundle/Resources/views/join/join.html.twig
[Master] Initial work on users database. Update XML schema and created first DB table