sync>
Merge remote-tracking branch 'origin/master'

Conflicts:
	chat/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
sync again
conflict?