Updated GUI
Updated GUI
Merge remote-tracking branch 'origin/master'

Conflicts:
	sync.py