modified addAusleihe.jsp
Merge origin/master
Merge origin/master
modified addAusleihe.jsp
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/hibernate.cfg.xml
	web/student/notebookauswahl.jsp