Merge branch 'hotfix/1.0.1'
add color event to calendar
Merge branch 'hotfix/1.0.2' into dev