added css
added calendar helper
Merge branch 'master' into kang