Added calendar to user view
Merge branch 'pt_booking' of https://github.com/redapesolutions/jatomidjango into pt_booking

Conflicts:
	jatomi/templates/mycalendar/book.html