Small updates

Changed some GUI stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChitChat/ChitChat.v12.suo