3
Merge remote-tracking branch 'origin/master' into ClientSideLogic

Conflicts:
	src/LibraryService.java