added 'set_archive_path' static method to PathTemplate object,
to have a more configurable 'get_archive_directory'.
The Session hardware object takes care of setting it from session.xml

Conflicts:
	HardwareObjects/queue_model_objects_v1.py
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

Conflicts:
	Bricks/widgets/create_xrf_scan_widget.py
fix typos

Conflicts:
	Bricks/HutchMenuBrick.py
renamed qmo to queue_model_objects
fixed bug: we don't return data collection object
fixed typo
Added beam width and height to grid dictionary
Merge branch 'master' into dev