:Starting with people
Adding semaster
before merge with dongye
Merge remote-tracking branch 'origin/latte-merge'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/programs/schools.html.haml
staring with data input
Fixed by Ge Yifan
Select2 and Xeditable implemented!!!!!!!!!!!!!!!!

Conflicts:
	app/assets/javascripts/programs.js.coffee
	app/controllers/programs_controller.rb
	app/views/programs/schools.html.haml