added initial_state
Merge branch '1.1' of github.com:next-l/enju_circulation into 1.1

Conflicts:
	app/models/reserve.rb