UPDATES the gui, the server and nodes files
Merge branch 'master' of https://github.com/AccessNow/TbirdKeySync

Conflicts:
	TBSButton.pyc
	TBSclient.pyc