Koll
Merge origin/master

Conflicts:
	Booklink/src/booklink/Kerstin.java