University Profie
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/controller/StudentController.java
	src/java/dao/StudentDAO.java
	src/java/model/StudentProfile.java
	src/java/model/UserProfile.java
	web/SearchUniversities.xhtml
	web/StudentProfile.xhtml