Merge branch 'hotfix/0.1.2'
update calendar about annas
Merge branch 'hotfix/0.1.3' into develop