reworked connection
Merge remote-tracking branch 'origin/branch_2' into branch_2

Conflicts:
	CSR Order GUI/__pycache__/csrLogic.cpython-33.pyc
	CSR Order GUI/__pycache__/queries.cpython-33.pyc