Working on the updating of Meta Information.
Merge branch 'develop' of github.com:agcooke/ExperimentControl into develop

Conflicts:
	bin/gui/experiment-control-gui.py