add full canlendar controller
Merge branch 'master' of https://github.com/sctravel/sctravel_develop