fixed state machines

Conflicts:
	app/models/reserve_state_machine.rb