A lot of messy work here with the dual calendars which now we're not using the user one.
Merge branch 'pt_booking' of https://github.com/redapesolutions/jatomidjango into pt_booking