Re #7924 fix conflict in comment
Merge remote branch 'origin/feature/7921_refl_save_button'
Fix bad conflict resolution

References issue #6
Disable the 3d option (if needed) on tab creation. Re #7902
Merge remote-tracking branch 'origin/master' into develop

Resolves a conflict with code that is on master but not develop
Refs #7902

Conflicts:
	Code/Mantid/scripts/reduction/instruments/reflectometer/wks_utility.py
Merge branch 'bugfix/7902_opengl_3d_option' into develop