LPS-46591 service.xml
LPS-46591 adding timeZoneId parameter to add and update methods
LPS-46591 Calendar returning timeZone acording to the Calendar timeZoneId
LPS-46591 Calendar Resource default calendar time zone added based on the user time zone if possible, or portal time zone otherwise
LPS-46591 added timeZoneId parameters fix
LPS-46591 added timezone selection on interface
LPS-46591 auto SF
LPS-46591 regen
LPS-46591 this regen should actually increment these numbers so that on deploy, we auto add the new table
LRDOCS-850 Add Chat Video portlet Javadoc from author Philippe Proulx, edited by Cody Hoag
LPS-51054 New calendar bookings should be considered master bookings
LPS-51054 - Source formatting
LPS-51052 Create model PushNotificationsEntry
LPS-51052 SF
LPS-51052 prefix with KEY_ so that you can prefix with VALUE_ later to different keys from values
LPS-51052 Regen
LPS-51052 SF
LPS-51052 prefix with KEY_ so that you can prefix with VALUE_ later to different keys from values
LPS-51052 Move sendNotification related methods to PushNotificationsEntry service

Conflicts:
	portlets/push-notifications-portlet/docroot/WEB-INF/src/com/liferay/pushnotifications/service/impl/PushNotificationsDeviceLocalServiceImpl.java
	portlets/push-notifications-portlet/docroot/WEB-INF/src/com/liferay/pushnotifications/service/impl/PushNotificationsDeviceServiceImpl.java
	portlets/push-notifications-portlet/docroot/WEB-INF/src/com/liferay/pushnotifications/service/impl/PushNotificationsEntryLocalServiceImpl.java
	portlets/push-notifications-portlet/docroot/WEB-INF/src/com/liferay/pushnotifications/service/impl/PushNotificationsEntryServiceImpl.java
LPS-51052 Persist notification

Conflicts:
	portlets/push-notifications-portlet/docroot/WEB-INF/service/com/liferay/pushnotifications/util/PushNotificationsConstants.java
	portlets/push-notifications-portlet/docroot/WEB-INF/src/com/liferay/pushnotifications/service/impl/PushNotificationsEntryLocalServiceImpl.java