Merge branch 'master' of https://github.com/thrive-refugee/thrive-refugee

Conflicts:
	.gitignore
	Makefile
Merge branch 'master' of https://github.com/thrive-refugee/thrive-refugee

Conflicts:
	refugee_manager/urls.py
	refugee_manager/views.py