Merge branch 'development' into '13-as-a-moderator-i-want-to-be-able-to-amend-and-remove-existing-locations-spaces-features'

# Conflicts:
#   project_server.py