Merge branch 'master' into cdeng_style
added calendar & re-style
Merge branch 'cdeng_style'