Student Test und ActivationMail Test angepasst
Merge origin/master

Conflicts:
	unidate/nbproject/build-impl.xml
	unidate/nbproject/genfiles.properties
	unidate/nbproject/project.properties
	unidate/nbproject/project.xml
	unidate/test/bean/StudentTest.java