do not use server to start EDNA
Merge branch 'master' of github.com:mxcube/mxcube

Conflicts:
	HardwareObjects/DataAnalysis.py