commit changes
add calendar
add calendar
Merge branch 'master' into xianrui
add layout assignment