backup for merge
Merge branch 'master' of github.com:uweschmitt/emzed

Conflicts:
	emzed_files/example_scripts/srm_explorer.py
	libms/DataBases/PubChemDB.py
	patched_modules/startup.py
	website/deploy.sh