Bug fixes
Merge branch 'master' of github.com:rsnipes/ur-calendar-dev