Fixed bug in user calendar
Merge branch 'master' of github.com:Panoptisis/team-up