Merge branch 'develop'
Merge branch 'develop'
Changes for add person
added migration
fixed a url config and added .orig gitignore
Merge branch 'develop' of github.com:michellelfloyd/evac-back into develop

Conflicts:
	apps/public/urls.py