CAL-631 Edit Calendar: NullPointerException when click Reset button
CAL-969 Default event categories are not localized
fa injection on 20140730-140952
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
Merge commit 'dedcce64030f93295fe9bfccb187ee375964ec09' into HEAD