Merge origin/master

Conflicts:
	AutoPrinterServer/web/deploy/lib/AutoPrinter.jar