Merge branch 'master' of github.com:gemhalo/eStudent

Conflicts:
	db/seeds.rb

Fix and refactoring for Application for admission

local modifications

Merge branch 'master' of github.com:gemhalo/eStudent

And Additional updates
Conflicts:
	app/controllers/moe_data_import_controller.rb
	app/models/applicant.rb
	app/models/person.rb
	db/seeds.rb

Refactoring with Amanuel