Merge branch 'master' into massif1

Conflicts:
	BlissFramework
	HardwareObjects/AbstractMultiCollect.py
	HardwareObjects/BeamInfo.py
	HardwareObjects/BeamlineSetup.py
	HardwareObjects/MiniDiff.py
	HardwareObjects/queue_entry.py
Revert "added keyword argument for get_display_name to return a tuple with (acronym, display_name)"

This reverts commit a315ab5a59e5a8fdc0730dfc92e4599b08ac1773.
use new methods from CreateTaskBase instead of repeating the same code again and again
fix typos
added beam_info role in AbstractMultiCollect
renamed qmo to queue_model_objects
fixed bug: we don't return data collection object
call 'wait' for make sure directory is created before setting saving directory
set camMirror to None if it is not specified in config xml file