Merge branch 'master' of https://github.com/xklech/PA165_library

Conflicts:
	library-web/src/main/resources/StripesResources_en.properties
Merge branch 'master' of https://github.com/xklech/PA165_library