added calendar adding support
fixed merge conflicts