rest
Merge branch 'SKS' of https://github.com/if12b049/ritzal_mueller into SKS

Conflicts:
	BookServiceWebApp/.idea/workspace.xml