updated authorization
Merge branch 'rails4' of github.com:next-l/enju_circulation into rails4

Conflicts:
	app/controllers/use_restrictions_controller.rb