Replaced Traits/TraitsUI with Atom/Enaml
Merge branch 'master' of https://github.com/MatthieuDartiailh/HQCMeas

Conflicts:
	.gitignore
	instrument_manager_launcher.py
	task_manager_launcher.py
	task_tests.py
Remove file coming from merge conflict