Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus

# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser

OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java

@@ -99,6 +99,7 @@ public class ServiceProvider extends UserType {
     public void setAvailabilities(int[][] availabilities) {
         this.availabilities = availabilities;
     }
+
     public void setServices(List<Service> services) {
         this.services = services;
     }