# Conflicts:
#   coworking_spaces.csv

Update static/testSearch.html, templates/OurSpaces.html, templates/Space.html,...

Closes #7

See merge request !47

# Conflicts:
#   project_server.py

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

Resolve "As a moderator, I want to be able to amend (and remove) existing locations/spaces/features."

Closes #13

See merge request !45

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

Changes to search functionality.

Closes #22

See merge request !43

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

Merge branch 'development' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into 7-as-a-user-i-want-to-see-all-of-the-working-spaces-available

Moving Manage Coworking Spaces page to template form.

Closes #22

See merge request !41

Pulled from development/pushed test server code

See merge request !42

Adding template directory and templates.

Closes #22

See merge request !40