week bookings
merged

resolved Conflicts:
	mysite/mysite/static/corman/js/controllers.js