Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/examiners_controller.rb
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Corrections to bio
Merge remote-tracking branch 'upstream/master'
Merge pull request #115 from adamarla/master

Few corrections to bios