Before merge with Jinqiu
Merge remote-tracking branch 'origin/Jinqiu'

Conflicts:
	app/views/people/staff.html.haml
Merge remote-tracking branch 'origin/Jinqiu'
Xeditable with staff
Finished region display
before merge with shuya
Change the controllers

Conflicts:
	app/controllers/people_controller.rb