Merge branch 'master' of https://github.com/Dragsbaek/theBlock

Conflicts:
app/assets/stylesheets/fullcalendar.css
app/assets/stylesheets/loundries.css.scss
app/views/loundries/_booking.html.erb
vendor/assets/javascripts/fullcalendar.js
Merge branch 'master' of https://github.com/Dragsbaek/theBlock

Conflicts:
	app/views/loundries/_booking.html.erb
	vendor/assets/javascripts/fullcalendar.js