BETA
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/biz/stillhart/profileManagement/controller/PasswordBean.java
	src/biz/stillhart/profileManagement/controller/RecoverSendBean.java
	src/biz/stillhart/profileManagement/model/DataBase.java
	src/biz/stillhart/profileManagement/model/Device.java
	src/biz/stillhart/profileManagement/model/Student.java
	src/biz/stillhart/profileManagement/utils/SessionUtils.java
	src/biz/stillhart/profileManagement/utils/UrlUtils.java
Merge remote-tracking branch 'origin/master'