Merge remote branch 'upstream/master'
Merge pull request #1 from olofsvensson/master

Update
Merge remote branch 'upstream/master'
Added small isESRF, isEMBL method to EDUtils. Added minor changes to autoproc
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/IvarsKarpics/edna-mx
Merge branch 'master' of https://github.com/IvarsKarpics/edna-mx into IvarsKarpics-master

Conflicts:
	mxPluginExec/plugins/EDPluginGroupAutoproc-v1.0/plugins/EDPluginControlAutoprocv1_0.py
Merge branch 'IvarsKarpics-master'