Merge origin/master

Conflicts:
	refugies/view/add_camp.php
Merge origin/master