Merge remote-tracking branch 'origin/feature/5417_dae_miscommunication'
Merge remote-tracking branch 'origin/feature/6878_html_help'
Merge remote branch 'origin/feature/6837_LatticeErrors'
Merge remote-tracking branch 'origin/feature/970_python_fitfunctions'
Merge remote-tracking branch 'origin/feature/6627_bug_in_tree_pick'
Put back output file prefixes.  Refs #6861.
Merge remote branch 'origin/feature/6861_putback_output'
Merge remote branch 'origin/feature/6880_helpwindow_on_exit'
Merge remote-tracking branch 'origin/feature/6202_remove_script_console'
Fit() in simpleapi sets additional properties in correct order.

Re #6621.
Added a test for this case. Re #6621.
Fixing the test for rhel6. Re #6621.
Merge remote-tracking branch 'origin/feature/6866_FixMantidEVPropertyNames'
Merge remote-tracking branch 'origin/feature/6560_update_indirect_scripts'
LoadVesuvio can now load the sum of foil in and out states

It previously could only load either in or out and not the combination
of both. Refs #6860
Minor refactor of LoadVesiuio for easier access to foil map.

A user can now use the SpectraFoilMap to access what periods are
defined to be in each state. Refs #6860
Merge branch 'feature/6860_loadvesuvio_both_foils' into develop