Merge remote-tracking branch 'origin/develop' into v1

# Conflicts:
#	admin/src/pages/settings.js
#	server/services/service.js

Author: LuisRodriguezLD

admin/src/pages/settings.js

@@ -26,6 +26,7 @@
   "view.settings.section.general.default-duration.1h": "1 Stunde",
   "view.settings.section.general.default-duration.1.5h": "1,5 Stunden",
   "view.settings.section.general.default-duration.2h": "2 Stunden",
+  "view.settings.section.general.default-duration.fullDay": "Ganztägig",
   "view.settings.section.general.start.label": "Start-Feld auswählen",
   "view.settings.section.general.start.none": "Kein Start-Feld",
   "view.settings.section.general.end.label": "Ende-Feld auswählen",

admin/src/translations/de.json

@@ -26,6 +26,7 @@
   "view.settings.section.general.default-duration.1h": "1 Hour",
   "view.settings.section.general.default-duration.1.5h": "1.5 Hours",
   "view.settings.section.general.default-duration.2h": "2 Hours",
+  "view.settings.section.general.default-duration.fullDay": "Full Day",
   "view.settings.section.general.start.label": "Choose your start field",
   "view.settings.section.general.start.none": "No start field",
   "view.settings.section.general.end.label": "Choose your end field",

admin/src/translations/en.json

@@ -26,6 +26,7 @@
   "view.settings.section.general.default-duration.1h": "1 hora",
   "view.settings.section.general.default-duration.1.5h": "1,5 horas",
   "view.settings.section.general.default-duration.2h": "2 horas",
+  "view.settings.section.general.default-duration.fullDay": "Todo el día",
   "view.settings.section.general.start.label": "Elija su campo de comienzo",
   "view.settings.section.general.start.none": "Sin campo de comienzo",
   "view.settings.section.general.end.label": "Elija su campo de finalización",