fixed schedule & calendar confliction
Merge branch 'master' of http://github.com/luzerno/caramel