changes from live: order condates
Merge branch 'master' of github.com:natebeaty/concalendar