Merge branch 'master' into develop

# Conflicts:
#	admin/src/pages/index.js
#	admin/src/translations/de.json
#	admin/src/translations/en.json
#	admin/src/translations/es.json
#	package.json
#	server/services/service.js
#	yarn.lock

Author: LuisRodriguezLD

admin/src/pages/index.js

@@ -295,7 +295,12 @@ function HomePage() {
             />
             <MonthView />
             <WeekView startDayHour={settings.startHour} endDayHour={settings.endHour} />
-            <WeekView name={'Work-Week'} excludedDays={[0,6]} startDayHour={settings.startHour} endDayHour={settings.endHour} />
+            <WeekView
+              name="Work-Week"
+              excludedDays={[0, 6]}
+              startDayHour={settings.startHour}
+              endDayHour={settings.endHour}
+            />
             <DayView startDayHour={settings.startHour} endDayHour={settings.endHour} />
             <Appointments appointmentComponent={Appointment} />
           </Scheduler>