Merge remote-tracking branch 'origin/feature/7373_peaks_layout_widget'
Merge remote-tracking branch 'origin/feature/7386_safe_detector_position'
Merge remote-tracking branch 'origin/bugfix/7391_bin_commonality'
Merge remote-tracking branch 'origin/feature/7366_idf_from_date'
Merge branch 'master' of https://github.com/mantidproject/mantid
Merge remote-tracking branch 'origin/feature/7154_load_instrument'
Merge remote-tracking branch 'origin/feature/7253_workspace_groups_and_dock'
refs #6667 Modified getNeutronAtom without exceptions to be really

without exceptions

As it is impossible to start Mantid in Debug mode as it throws thousand exceptions which are then catched, analyzed, reported and one has to wait for 1 min to start trivial program
Merge branch 'feature/7398_NonThrowingAtom' into develop