Dima first
second
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	GRecruiting/WebContent/student/student.jsp