Added server launch
Merge with upstream.
Merge branch 'gtk3' of github.com:eugeneai/dispersive into gtk3

Conflicts:
	icc_xray_app.sh