Not to be synched
Merge branch 'master' of https://github.com/DCSGInterns/GUI

Conflicts:
	UI Classes.txt