CAL-1030 [Unified search] Cannot search Event/Task with special characters
CAL-1042 Potential IDM hibernate session leak
UI-3125 calendar look bad when resize window

Conflicts:
	calendar-webapp/src/main/webapp/skin/less/uiHeaderBar/Style.less
CAL-955 Use email validator from GateIn instead of hardcode email regex
CAL-992 Fix [WARNING] issues during maven build
CAL-631 Edit Calendar: NullPointerException when click Reset button
CAL-969 Default event categories are not localized
CAL-637 Current day is not highlighted on month view
CAL-968 Do NOT use absolute/hardcord links in Calendar gadgets
CAL-938 [Unified Search]: Confirm about displaying time info of event or task in unified seach
CAL-985 Calendar list in calendar gadget is duplicated after opening calendar setting
CAL-986 Unable to deactivate calendar generation for all groups with wildcard
CAL-705 Cannot resize an event with duration of 30 minutes
CAL-1004 Can't edit event by double clicking in ListView
CAL-795 Displaying of day on client-side follows server time
CAL-1017 Event is not displayed in week view when event date is next month
CAL-1011 [Add remote calendar] Cannot add a remote calendar
CAL-1013 Data injector does not work
CAL-1008 The display group label in tree view when select Group
CAL-632 [Unified search]Incorrect date time in details information of Calendar search result