fix calendar bug
021 "When user pushed the CSV button, please change an alert message when user didn't set e-mail.
Merge remote-tracking branch 'origin/master'