Sloppy reset implementation.
Merge branch 'master' of https://github.com/vbarua/QDG-Lab-Framework

Conflicts:
	Server/PATServer.py
	Server/SaveController.py