give to shuya
Changing routes
Merge remote-tracking branch 'origin/latte' into refactory

Conflicts:
	config/routes.rb
able to save email
Cannot add region
finish user name, email, region for staff
Begin adding teacher region
Techer region, get from remote
before merge with dongye
Merge remote-tracking branch 'origin/latte'

Conflicts:
	app/assets/javascripts/x_editable.js.coffee
	app/controllers/programs_controller.rb
	app/controllers/programs_page_controller.rb
	app/helpers/programs_helper.rb
	app/models/region.rb
	app/models/user.rb
	app/views/people_page/staff.html.haml
	config/routes.rb
New staff, teacher and student added.
New staff, teacher, student.