#gt-125 done
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/remote_authenticate_controller.rb