pre merge commit
Merge branch 'master' of
https://github.com/KreMat/SKS_BookServiceWebApp.git

Conflicts:
	BookServiceWebApp/src/at/wien/technikum/winterhalderkreuzriegler/sks/entity/Author.java