before merge with shuya
Change the controllers

Conflicts:
	app/controllers/people_controller.rb
CREATE button on staff page