updated scope
Merge branch '1.1' of github.com:next-l/enju_library into 1.1

Conflicts:
	app/models/budget_type.rb
	app/models/library.rb
	app/models/request_status_type.rb
	app/models/request_type.rb
	app/models/shelf.rb
fixed scope