Merge branch 'explore-menu' of https://bitbucket.org/client_projects/constituency-backend into change-password

# Conflicts:
#	app/Services/GiftService.php
