Squash merge master
Conflicts:
	app/models/reservation.rb
linted source