more
lots of refactoring to prevent leaks
more
more
Merge branch 'upstream'

Conflicts:
	drawerobserver.cpp
	mainwindow.cpp
	optionsdialog.cpp
	salorjsapi.cpp
	salorjsapi.h
	salornetwork.cpp
	salornetwork.h
	salorprinter.cpp
build