foranea en location
Revert "foranea en location"

This reverts commit fb46a0a85830aecf60a559b59bebfd23b73e906e.
foranea en location
Revert "foranea en location"

This reverts commit b06961c1d19659aa2e591e698df3c244f6b0eb07.
listCalendars Basic
listCalendars Basic
commit german
Merge origin/iniciallocal into iniciallocal

Conflicts:
	target/classes/calendarservice/CalendarController.class
	target/stacktrace.log