reservations could overlap a started, but not ended reservation

Caused by c1db2aa02606dbed2a9adbf46b053758b68164f9
assign_attributes doesn't exist in rails 3.0
Merge branch 'master' into upgrades

Conflicts:
	spec/models/reservation_spec.rb