Committing minor changes for merge.
Merge branch 'master' of https://github.com/vbarua/QDG-Lab-Framework

Conflicts:
	Client/PATController.py
Checked settings reorganisation and fixed imports as necessary.