tweaks to lcnaf plugins
Merge branch 'master' of github.com:archivesspace/archivesspace

Conflicts:
	plugins/lcnaf/frontend/controllers/lcnaf_controller.rb