Bootstrap
Merge branch 'master' of https://github.com/sploosch/tddd27

Conflicts:
	mysite/mysite/static/corman/js/controllers.js
	mysite/mysite/static/corman/partials/booking_dialog.html
	mysite/mysite/static/corman/partials/user_bookings.html