LPS-33936 - service.xml
LPS-33936 - Updated Java classes

Conflicts:
	portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/util/PortletPropsKeys.java
LPS-33936 - Updated JSP files/Language resources
LPS-33936 - Autogenerated but manually edited Service Builder classes
LPS-33936 - Refactoring: a little rename (not included in previous commits for clarity)
LPS-33936 - Changing template configuration interface: using tabs instead of listboxes

Conflicts:
	portlets/calendar-portlet/docroot/WEB-INF/lib/calendar-portlet-service.jar
	portlets/calendar-portlet/docroot/WEB-INF/src/service.properties
LPS-33936 Source formatting
LPS-33936 Source formatting (view)
LPS-33936 Source Formatting
LPS-33936 Rename typeSettings to notificationTypeSettings
LPS-33936 SF
LPS-33936 Regenerate
LPS-33936 Lang keys