Merge branch 'ba' into...

Merge branch 'ba' into '27-as-a-user-i-would-like-to-be-able-to-add-nursing-homes-information-so-that-the-system-can-record'

# Conflicts:
#   src/main/java/com/cardiff/client_project/controller/nursinghome/NursingHomeController.java
#   src/main/java/com/cardiff/client_project/service/NursingHomeService.java
#   src/main/java/com/cardiff/client_project/service/imp/NursingHomeServiceImp.java