#
# ChangeLog for src/sas/sasgui in sasview
#
# Generated by Trac 1.0.1
# Dec 24, 2024 1:50:08 PM

Mon, 16 Apr 2018 20:30:22 GMT Paul Kienzle <pkienzle@…> [e870702]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	PageState doesn't need is_2D attribute


Mon, 09 Apr 2018 16:00:41 GMT krzywon [63ddc03]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasview/test/1d_data/10000A_sphere_dsm.xml (moved)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* test/sasdataloader/test/FEB18012.ASC (added)
	* test/sasdataloader/test/test_data/TestExtensions (added)
	* test/sasdataloader/test/test_data/TestExtensions.asc (added)
	* test/sasdataloader/test/test_data/TestExtensions.notxml (added)
	* test/sasdataloader/test/test_data/TestExtensions.nxs (added)
	* test/sasdataloader/test/test_data/TestExtensions.xml (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)

	Merge branch 'master' into ticket-1068-2


Mon, 19 Mar 2018 10:23:58 GMT GitHub <noreply@…> [85d98e2]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Merge pull request #145 from SasView/ticket-930ChiSquaredDoc

	Ticket 930 ...


Sun, 18 Mar 2018 18:02:16 GMT butler [47ace50]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)

	fix as per comments.

	addresses #930


Wed, 07 Mar 2018 14:39:18 GMT krzywon [2924532]
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Cleanup of the SasView GUI data loader error handling and a more ...


Tue, 06 Mar 2018 16:54:24 GMT krzywon [c6dfb9f]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Update the Sum|Multi editor model selectors when a new user model is ...


Mon, 05 Mar 2018 03:14:20 GMT butler [84ac3f1]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)

	More Edits

	Clean up new documentation as well as fix older incorrect ...


Sun, 04 Mar 2018 23:07:55 GMT butler [a7c6f38]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)

	Clarify use of chi^2 in GUI and documentation

	Changed Gui name and ...


Tue, 13 Feb 2018 17:15:48 GMT smk78 [61bfd36]
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)

	Make jitter viewer available from Tools


Tue, 13 Feb 2018 16:57:55 GMT smk78 [1eb86a5]
	* docs/sphinx-docs/source/user/marketplace.rst (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Updated help text in data_formats_help.rst & marketplace.rst


Tue, 13 Feb 2018 12:04:12 GMT smk78 [fafb396]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)

	Fixed broken external link to ISIS data format descriptions


Tue, 13 Feb 2018 11:27:49 GMT smk78 [baa3348]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Fixed broken external link for ISIS 1D data format description


Wed, 31 Jan 2018 14:40:30 GMT krzywon [1f4d708]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Have the fall back use the same method as the main.


Wed, 31 Jan 2018 14:25:11 GMT krzywon [72670ad2]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Incorporate suggested changes and make py3 compatible.


Tue, 30 Jan 2018 13:54:09 GMT krzywon [9d8d52c]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Use distribution name to check for array distribution instead of
	index.


Fri, 26 Jan 2018 09:39:56 GMT GitHub <noreply@…> [c99e717]
	* docs/sphinx-docs/source/conf.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* installers/installer_generator.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge pull request #139 from rprospero/Ticket_997

	Remove all instances ...


Fri, 26 Jan 2018 09:16:07 GMT Adam Washington <adam.washington@…> [501712f]
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)

	Remove redundant mathrm from Average Interface Thickness


Thu, 25 Jan 2018 17:06:35 GMT Adam Washington <adam.washington@…> [3bd58f0]
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)

	Fix a type in the resolution calculator's equations


Wed, 24 Jan 2018 09:33:30 GMT Adam Washington <adam.washington@…> [55abe4f]
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)

	The "th" in j^th is text and not a math symbol.


Wed, 24 Jan 2018 09:29:23 GMT Adam Washington <adam.washington@…> [f16aca8]
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)

	Document the minimum wavelength.


Wed, 24 Jan 2018 09:26:47 GMT Adam Washington <adam.washington@…> [ee62ed7]
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)

	Fix mangled equation


Wed, 24 Jan 2018 09:24:13 GMT Adam Washington <adam.washington@…> [4b4b746]
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)

	Still use \text when the equation has text


Tue, 16 Jan 2018 02:41:47 GMT GitHub <noreply@…> [e110cb0]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* .gitignore (modified)
	* installers/installer_generator.py (modified)
	* installers/sasview.spec (modified)
	* installers/version.txt (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sasgui/guiframe/images/Thumbs.db (deleted)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasview/images/dls_logo.png (modified)
	* src/sas/sasview/images/tudelft_logo.png (modified)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (modified)
	* test/sasdataloader/test/nans_in_1d_data.dat (added)
	* test/sasdataloader/test/nans_in_2d_data.DAT (added)
	* test/sasdataloader/test/utest_ascii.py (modified)

	Merge pull request #137 from llimeht/tmp/htmllowercase

	Allow models to ...


Fri, 12 Jan 2018 17:24:18 GMT Adam Washington <adam.washington@…> [8cc9048]
	* docs/sphinx-docs/source/conf.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)

	Remove all instances of \text from the repo


Wed, 10 Jan 2018 13:29:22 GMT GitHub <noreply@…> [2bdf61a]
	* .gitignore (modified)
	* src/sas/sasgui/guiframe/images/Thumbs.db (deleted)
	* installers/sasview.spec (modified)
	* installers/version.txt (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasview/images/dls_logo.png (modified)
	* src/sas/sasview/images/tudelft_logo.png (modified)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (modified)

	Merge pull request #138 from llimeht/tmp/thumbsdb

	Remove Thumbs.db from ...


Tue, 09 Jan 2018 14:38:55 GMT Stuart Prescott <stuart@…> [1b605fb]
	* .gitignore (modified)
	* src/sas/sasgui/guiframe/images/Thumbs.db (deleted)

	Remove Thumbs.db from repository

	Thumbs.db is a cache of image ...


Tue, 09 Jan 2018 13:07:53 GMT Stuart Prescott <stuart@…> [58a8f76]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Allow models to have mixed case filenames in help

	sasmodels contains ...


Tue, 09 Jan 2018 12:58:32 GMT Stuart Prescott <stuart@…> [af7d2e5]
	* installers/sasview.spec (modified)
	* installers/version.txt (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasview/images/dls_logo.png (modified)
	* src/sas/sasview/images/tudelft_logo.png (modified)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (modified)

	Remove executable mode from data files


Fri, 15 Dec 2017 10:09:24 GMT Adam Washington <adam.washington@…> [42a6e02]
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)

	Improve logging messages


Tue, 12 Dec 2017 15:16:36 GMT Adam Washington <adam.washington@…> [66285f5]
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)

	Catch OpenCL errors thrown during platform detection.


Fri, 01 Dec 2017 13:03:15 GMT GitHub <noreply@…> [7303357]
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted)

	Merge pull request #131 from SasView/ticket1007

	Fixing ticket1007 and ...


Fri, 01 Dec 2017 10:31:05 GMT Gonzalez, Miguel <gonzalez@…> [eee94bf]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Removed debugging comments


Thu, 30 Nov 2017 16:18:07 GMT Paul Kienzle <pkienzle@…> [bfeb823]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	fix gui to work with spherical_sld


Thu, 30 Nov 2017 15:51:13 GMT GitHub <noreply@…> [c66a0bb]
	* docs/sphinx-docs/source/_extensions/dollarmath.py (modified)
	* setup.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/data_util/uniquelist.py (deleted)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/file_converter/otoko_loader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/qsmearing.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into ticket1007


Thu, 30 Nov 2017 14:49:07 GMT Paul Kienzle <pkienzle@…> [a583749]
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (deleted)

	remove unused calculator/media/gen_sas_help.html


Thu, 30 Nov 2017 13:31:20 GMT Gonzalez, Miguel <gonzalez@…> [ee6ab94]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Fixing ticket1007 and hopefully other similar sources of error


Thu, 30 Nov 2017 13:24:24 GMT Paul Kienzle <pkienzle@…> [fb7c816]
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)

	restore magnetism picture accidentally deleted along with the
	equation ...


Tue, 28 Nov 2017 14:56:33 GMT GitHub <noreply@…> [882cfec]
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* docs/sphinx-docs/source/_extensions/dollarmath.py (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* setup.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/data_util/uniquelist.py (deleted)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/file_converter/otoko_loader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/qsmearing.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasview/__init__.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)

	Merge pull request #126 from SasView/ticket-776-orientation

	a


Tue, 28 Nov 2017 14:21:58 GMT GitHub <noreply@…> [45bfe3f1]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/fit/qsmearing.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted)

	Merge pull request #128 from SasView/true

	lint: update 'if ...


Fri, 24 Nov 2017 16:11:45 GMT Paul Kienzle <pkienzle@…> [1b67f3e]
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)

	fix translation from image back to tex for M_{perp y'}


Mon, 20 Nov 2017 18:15:52 GMT Paul Kienzle <pkienzle@…> [2469df7]
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/fit/qsmearing.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	lint: update 'if x==True/False' to 'if x/not x:'


Fri, 03 Nov 2017 21:58:32 GMT Paul Kienzle <pkienzle@…> [6ccc55f]
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)

	translate equation images back into latex for sas_calculator_help


Fri, 03 Nov 2017 21:55:22 GMT Paul Kienzle <pkienzle@…> [2f7ea43]
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (deleted)

	translate equation images back into latex for sas_calculator_help


Thu, 02 Nov 2017 09:21:47 GMT Stuart Prescott <stuart@…> [20fa5fe]
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/file_converter/otoko_loader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasview/sasview.py (modified)

	Fix lots more typos in comments and docs


Wed, 01 Nov 2017 08:43:39 GMT gonzalezm [df4af9b]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Removing files corresponding to ticket #1007 from this PR


Sun, 29 Oct 2017 14:17:03 GMT gonzalezm [1c206d9]
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)

	Restore functionality of sum/multiply editor


Sat, 28 Oct 2017 21:13:30 GMT gonzalezm [0be6b6b]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Fix tuple problem with spherical_sld


Fri, 27 Oct 2017 11:54:20 GMT richardh [c926a97]
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)

	a
	new docs for orientation


Thu, 28 Sep 2017 22:27:25 GMT Paul Kienzle <pkienzle@…> [3bd677b]
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image001.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image002.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image003.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image004.jpg (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image005.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image006.jpg (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image007.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image008.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image009.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image010.jpg (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image011.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image012.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_image013.jpg (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (deleted)

	refactor interface to sasmodels including the sasmodels api and using ...


Thu, 28 Sep 2017 22:17:46 GMT Paul Kienzle <pkienzle@…> [a26f67f]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/file_converter/c_ext/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)

	fixup api doc errors


Thu, 28 Sep 2017 21:36:12 GMT Paul Kienzle <pkienzle@…> [64cdb0d]
	* src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (modified)

	document fitting/plugin_models directory


Thu, 28 Sep 2017 21:29:35 GMT Paul Kienzle <pkienzle@…> [99ded31]
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)

	improve description of 'fitting quality' and clean up latex
	formatting


Thu, 28 Sep 2017 21:28:40 GMT Paul Kienzle <pkienzle@…> [5005ae0]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)

	doc formatting cleanup


Wed, 27 Sep 2017 14:50:34 GMT Paul Kienzle <pkienzle@…> [b916afa]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
	* build_tools/conda/periodictable/meta.yaml (modified)
	* build_tools/jenkins_rhel6_build.sh (modified)
	* build_tools/requirements.txt (modified)
	* check_packages.py (modified)
	* run.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/nxsunit.py (modified)
	* src/sas/sascalc/data_util/odict.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/__init__.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/file_converter/nxcansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sascalc/fit/pluginmodel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* test/run_one.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_sld.py (moved)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)

	Merge branch 'ticket-853-fit-gui-to-calc' into py3


Wed, 27 Sep 2017 14:50:02 GMT Paul Kienzle <pkienzle@…> [9be22cd]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
	* installers/setup_exe.py (modified)
	* installers/setup_mac.py (modified)
	* src/sas/__init__.py (modified)
	* src/sas/_config.py (added)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/models.py (added)
	* src/sas/sascalc/fit/pagestate.py (moved)
	* src/sas/sascalc/fit/qsmearing.py (moved)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (deleted)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (deleted)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* src/sas/sasview/welcome_panel.py (modified)

	Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc


Wed, 27 Sep 2017 14:49:33 GMT Paul Kienzle <pkienzle@…> [83db1cc]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
	* .gitignore (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/README.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview.spec (moved)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/__init__.py (deleted)
	* sasview/sasview.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/__init__.py (added)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/dls_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/local_config.py (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/sasview.py (added)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved)
	* src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)

	Merge branch 'ticket-869' into ticket-887-reorg


Wed, 27 Sep 2017 14:48:50 GMT Paul Kienzle <pkienzle@…> [38a1e63]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge branch 'ticket-915' into ticket-869


Wed, 27 Sep 2017 14:47:44 GMT Paul Kienzle <pkienzle@…> [4b001f3]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)
	* sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved)
	* sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)

	Merge branch 'master' into ticket-915


Tue, 26 Sep 2017 21:18:30 GMT Paul Kienzle <pkienzle@…> [5a81885]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* build_tools/conda/periodictable/meta.yaml (modified)
	* build_tools/jenkins_rhel6_build.sh (modified)
	* build_tools/requirements.txt (modified)
	* check_packages.py (modified)
	* run.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/nxsunit.py (modified)
	* src/sas/sascalc/data_util/odict.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/__init__.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/file_converter/nxcansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sascalc/fit/pluginmodel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* test/run_one.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_sld.py (moved)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)

	Merge branch 'ticket-853-fit-gui-to-calc' into py3


Tue, 26 Sep 2017 21:18:01 GMT Paul Kienzle <pkienzle@…> [69a6897]
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)

	fix image handling for saved reports


Tue, 26 Sep 2017 19:30:27 GMT Paul Kienzle <pkienzle@…> [0a3c740]
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	fix merge errors


Tue, 26 Sep 2017 19:16:36 GMT Paul Kienzle <pkienzle@…> [1efbc190]
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)

	fix merge errors


Tue, 26 Sep 2017 11:33:32 GMT smk78 [ad476d1]
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)

	Updated corfunc_help.rst


Tue, 26 Sep 2017 11:32:56 GMT smk78 [56b4874]
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (modified)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial4.png (added)

	Updated screenshots for corfunc_help.rst


Mon, 25 Sep 2017 21:38:15 GMT Paul Kienzle <pkienzle@…> [24d9e84]
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	forgot to save sim_fit_page before completing merge


Mon, 25 Sep 2017 21:24:46 GMT Paul Kienzle <pkienzle@…> [0315b63]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/fit/pagestate.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved)
	* src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved)
	* installers/setup_exe.py (modified)
	* installers/setup_mac.py (modified)
	* src/sas/__init__.py (modified)
	* src/sas/_config.py (added)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/models.py (added)
	* src/sas/sascalc/fit/qsmearing.py (moved)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (deleted)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (deleted)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* src/sas/sasview/welcome_panel.py (modified)

	Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc


Mon, 25 Sep 2017 21:01:30 GMT Paul Kienzle <pkienzle@…> [66000ae]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved)
	* src/sas/sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved)
	* .gitignore (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/README.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview.spec (moved)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/__init__.py (deleted)
	* sasview/sasview.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/__init__.py (added)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/dls_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/local_config.py (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/sasview.py (added)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)

	Merge branch 'ticket-869' into ticket-887-reorg


Mon, 25 Sep 2017 20:39:00 GMT Paul Kienzle <pkienzle@…> [72d3f1e]
	* sasview/test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved)
	* sasview/test/convertible_files/YBCO_12685__ISIS2D.txt (moved)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge branch 'ticket-915' into ticket-869


Mon, 25 Sep 2017 20:28:37 GMT krzywon [48154abb]
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)

	Smear and draw fit pages at the end of loading save states to update ...


Mon, 25 Sep 2017 14:02:52 GMT krzywon [1fa4f736]
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)

	Only process data element if <perspective> element is present in ...


Mon, 25 Sep 2017 03:29:13 GMT Paul Kienzle <pkienzle@…> [b963b20]
	* installers/setup_exe.py (modified)
	* installers/setup_mac.py (modified)
	* src/sas/__init__.py (modified)
	* src/sas/_config.py (added)
	* src/sas/sascalc/fit/models.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (deleted)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* src/sas/sasview/welcome_panel.py (modified)

	pull config out of sas.sasgui so it can be used without reference to
	wx


Sat, 23 Sep 2017 20:24:27 GMT Paul Kienzle <pkienzle@…> [d3b0c77]
	* .gitignore (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/README.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview.spec (moved)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/__init__.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/fit/models.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/__init__.py (added)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/dls_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/local_config.py (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/sasview.py (moved)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/pagestate.py (moved)
	* src/sas/sascalc/fit/qsmearing.py (moved)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (deleted)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc


Sat, 23 Sep 2017 19:37:35 GMT Paul Kienzle <pkienzle@…> [dba8557]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* .gitignore (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/README.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview.spec (moved)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/__init__.py (deleted)
	* sasview/sasview.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/__init__.py (added)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/dls_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/local_config.py (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/sasview.py (added)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)

	Merge branch 'ticket-869' into ticket-887-reorg


Sat, 23 Sep 2017 19:35:45 GMT Paul Kienzle <pkienzle@…> [53b8266]
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/utest_sasview.py (modified)

	Merge branch 'master' into ticket-869


Fri, 22 Sep 2017 16:21:37 GMT Paul Kienzle <pkienzle@…> [9706d88]
	* src/sas/sascalc/fit/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	merge fixups


Fri, 22 Sep 2017 14:57:45 GMT Paul Kienzle <pkienzle@…> [ab0b93f]
	* src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (moved)

	move plugin_models directory back to fitting; it is only used by the ...


Fri, 22 Sep 2017 14:29:48 GMT Paul Kienzle <pkienzle@…> [69363c7]
	* .gitignore (modified)
	* .pydevproject (modified)
	* README.md (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/local_config.py (modified)
	* sasview/sasview.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* setup.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (added)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/loader_exceptions.py (added)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (deleted)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/defaults.json (deleted)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/ascii2d_loader.py (added)
	* src/sas/sascalc/fit/models.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/fileconverter/test/cansas1d.xml (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.h5 (added)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_extension_registry.py (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (added)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/sasdataloader/test/valid_cansas_xml.xml (added)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/utest_sasview.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/pagestate.py (moved)
	* src/sas/sascalc/fit/plugin_models/__init__.py (moved)
	* src/sas/sascalc/fit/qsmearing.py (moved)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (deleted)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)

	Merge branch 'master' into ticket-853-fit-gui-to-calc


Thu, 21 Sep 2017 20:14:06 GMT Paul Kienzle <pkienzle@…> [12d3e0e]
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)

	reinstate empty plugin models directory


Thu, 21 Sep 2017 19:12:37 GMT Paul Kienzle <pkienzle@…> [724af06]
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* installers/README.txt (modified)
	* installers/sasview.spec (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasview/__init__.py (modified)
	* src/sas/sasview/local_config.py (modified)
	* src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/utest_sasview.py (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/sasview.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/dls_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/sasview.py (added)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)

	Merge branch 'master' into ticket-887-reorg


Thu, 21 Sep 2017 11:45:03 GMT krzywon [9804394]
	* .gitignore (modified)
	* .pydevproject (modified)
	* README.md (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* check_packages.py (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/local_config.py (modified)
	* sasview/sasview.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* setup.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (added)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/loader_exceptions.py (added)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (deleted)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/defaults.json (deleted)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/ascii2d_loader.py (added)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/fileconverter/test/cansas1d.xml (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.h5 (added)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_extension_registry.py (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (added)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/sasdataloader/test/valid_cansas_xml.xml (added)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/utest_sasview.py (modified)

	Merge branch 'master' into ticket-915


Wed, 20 Sep 2017 23:26:17 GMT Paul Kienzle <pkienzle@…> [5a405bd]
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)

	bundle resource files by directory


Wed, 20 Sep 2017 23:24:29 GMT Paul Kienzle <pkienzle@…> [6e50a8d]
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)

	remove unused methods from CategoryInstaller


Wed, 20 Sep 2017 16:21:41 GMT Paul Kienzle <pkienzle@…> [f80b416e]
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/utest_sasview.py (modified)
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)

	Merge branch 'master' into ticket-639-katex


Wed, 20 Sep 2017 11:55:53 GMT Paul Kienzle <pkienzle@…> [13374be]
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/utest_sasview.py (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Merge branch 'master' into 4_1_issues


Wed, 20 Sep 2017 10:01:02 GMT smk78 [2a399ca]
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)

	Corrected parameter labels in Corfunc perspective
	The Corfunc panel was ...


Tue, 19 Sep 2017 18:07:00 GMT Paul Kienzle <pkienzle@…> [932519a]
	* sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added)
	* sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* test/corfunc/test/gamma1_out.txt (added)
	* test/corfunc/test/gamma3_out.txt (added)
	* test/corfunc/test/idf_out.txt (added)
	* test/utest_sasview.py (modified)

	Merge branch 'master' into corfunc3d


Tue, 19 Sep 2017 13:28:58 GMT GitHub <noreply@…> [66acafe]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* test/corfunc/test/utest_corfunc.py (modified)

	Merge pull request #104 from lewisodriscoll/ticket-861

	Ticket 861


Tue, 19 Sep 2017 12:48:03 GMT Paul Kienzle <pkienzle@…> [2746eab]
	* src/sas/sasgui/guiframe/documentation_window.py (modified)

	don't use wx html renderer on windows since it doesn't render mathjax


Tue, 19 Sep 2017 11:38:25 GMT Paul Kienzle <pkienzle@…> [dfc9604]
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (modified)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (modified)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)

	Merge branch 'master' into ticket-639-katex


Tue, 19 Sep 2017 02:07:49 GMT GitHub <noreply@…> [8c945ec]
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)

	Merge pull request #101 from lewisodriscoll/4.2.0-fixes

	4.2.0 fixes


Mon, 18 Sep 2017 19:00:13 GMT Paul Kienzle <pkienzle@…> [835937b5]
	* .pydevproject (modified)
	* README.md (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/utest_sasview.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Merge branch 'master' into ticket-869


Mon, 18 Sep 2017 18:19:13 GMT Paul Kienzle <pkienzle@…> [c5cfb20]
	* .pydevproject (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/utest_sasview.py (modified)
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* docs/sphinx-docs/Makefile (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/convertKaTex.js (added)
	* docs/sphinx-docs/convertMathJax.js (added)
	* docs/sphinx-docs/source/_extensions/mathjax.py (added)
	* docs/sphinx-docs/source/_static/rendermath.js (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/rst_prolog (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/images/utlogo.png (added)
	* src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/guiframe/media/M_angles_pic.png (added)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/.DS_Store (added)
	* src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_i.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added)
	* src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqx.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mqy.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mxp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/myp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/mzp.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)
	* src/sas/sasgui/perspectives/calculator/media/q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld1.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/file_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqx.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mqy.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mxp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/myp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mzp.png (added)
	* src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/new_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/plot_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld1.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sld2.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sum_model.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_button.png (added)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added)
	* src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted)
	* src/sas/sasgui/perspectives/invariant/media/image005.png (added)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)

	Merge branch 'master' into ticket-639-katex


Mon, 18 Sep 2017 14:20:29 GMT Paul Kienzle <pkienzle@…> [706bb4e]
	* .pydevproject (modified)
	* README.md (modified)
	* sasview/images/dls_logo.png (moved)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasview/sasview.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* .gitignore (modified)
	* build_tools/deploy.bat (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* build_tools/travis_build.sh (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* installers/MANIFEST.IN (moved)
	* installers/README-next-release.txt (moved)
	* installers/README.txt (moved)
	* installers/installer_generator.py (moved)
	* installers/license.txt (moved)
	* installers/macholib_patch.py (added)
	* installers/sasview.spec (moved)
	* installers/sasview_console.py (added)
	* installers/sasview_gui.py (added)
	* installers/setup.cfg (moved)
	* installers/setup_exe.py (moved)
	* installers/setup_mac.py (added)
	* installers/version.txt (moved)
	* run.py (modified)
	* sasview/__init__.py (deleted)
	* sasview/setup_mac.py (deleted)
	* setup.py (modified)
	* src/sas/logger_config.py (moved)
	* src/sas/logging.ini (moved)
	* src/sas/sasgui/__init__.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/plottools/__init__.py (modified)
	* src/sas/sasgui/plottools/config.py (modified)
	* src/sas/sasview/__init__.py (added)
	* src/sas/sasview/custom_config.py (moved)
	* src/sas/sasview/images/SVwelcome.png (moved)
	* src/sas/sasview/images/SVwelcome_mini.png (moved)
	* src/sas/sasview/images/angles.png (moved)
	* src/sas/sasview/images/angles_flat.png (moved)
	* src/sas/sasview/images/ansto_logo.png (moved)
	* src/sas/sasview/images/ball.icns (moved)
	* src/sas/sasview/images/ball.ico (moved)
	* src/sas/sasview/images/danse_logo.png (moved)
	* src/sas/sasview/images/ess_logo.png (moved)
	* src/sas/sasview/images/ill_logo.png (moved)
	* src/sas/sasview/images/isis_logo.png (moved)
	* src/sas/sasview/images/nist_logo.png (moved)
	* src/sas/sasview/images/nsf_logo.png (moved)
	* src/sas/sasview/images/ornl_logo.png (moved)
	* src/sas/sasview/images/sns_logo.png (moved)
	* src/sas/sasview/images/tudelft_logo.png (moved)
	* src/sas/sasview/images/umd_logo.png (moved)
	* src/sas/sasview/images/utlogo.gif (moved)
	* src/sas/sasview/local_config.py (moved)
	* src/sas/sasview/media/README.txt (moved)
	* src/sas/sasview/media/Tutorial.pdf (moved)
	* src/sas/sasview/media/getting_started_with_sasview.pdf (moved)
	* src/sas/sasview/test/1d_data/ testdata_line1.txt (moved)
	* src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved)
	* src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved)
	* src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved)
	* src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved)
	* src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved)
	* src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved)
	* src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved)
	* src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved)
	* src/sas/sasview/test/1d_data/PolySpheres.txt (moved)
	* src/sas/sasview/test/1d_data/beam profile.DAT (moved)
	* src/sas/sasview/test/1d_data/circular_test.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_20.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_400_40.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved)
	* src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved)
	* src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved)
	* src/sas/sasview/test/1d_data/latex_smeared.xml (moved)
	* src/sas/sasview/test/1d_data/rpa_igor.txt (moved)
	* src/sas/sasview/test/1d_data/saxess_example.pdh (moved)
	* src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved)
	* src/sas/sasview/test/1d_data/sphere_80.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line.txt (moved)
	* src/sas/sasview/test/1d_data/testdata_line3.txt (moved)
	* src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/2P_New.sans (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved)
	* src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved)
	* src/sas/sasview/test/2d_data/Dec07031.ASC (added)
	* src/sas/sasview/test/2d_data/HiResSAN14.ASC (added)
	* src/sas/sasview/test/2d_data/MAR07262.ASC (added)
	* src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved)
	* src/sas/sasview/test/2d_data/P_New.sans (moved)
	* src/sas/sasview/test/2d_data/SILIC009.ASC (added)
	* src/sas/sasview/test/2d_data/SILIC010.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved)
	* src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved)
	* src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved)
	* src/sas/sasview/test/README.txt (moved)
	* src/sas/sasview/test/convertible_files/APS_X.TXT (moved)
	* src/sas/sasview/test/convertible_files/APS_Y.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* src/sas/sasview/test/convertible_files/Z83000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z83001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z83002.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98000.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98001.I1D (moved)
	* src/sas/sasview/test/convertible_files/Z98001.QAX (moved)
	* src/sas/sasview/test/convertible_files/Z98002.I1D (moved)
	* src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved)
	* src/sas/sasview/test/coordinate_data/diamond.pdb (moved)
	* src/sas/sasview/test/coordinate_data/dna.pdb (moved)
	* src/sas/sasview/test/coordinate_data/sld_file.sld (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved)
	* src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved)
	* src/sas/sasview/test/media/testdata_help.rst (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved)
	* src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved)
	* src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved)
	* src/sas/sasview/test/other_files/phi_weights.txt (moved)
	* src/sas/sasview/test/other_files/radius_dist.txt (moved)
	* src/sas/sasview/test/other_files/theta_weights.txt (moved)
	* src/sas/sasview/test/save_states/constrained_fit_project.svs (moved)
	* src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved)
	* src/sas/sasview/test/save_states/fitstate.fitv (moved)
	* src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved)
	* src/sas/sasview/test/save_states/prstate.prv (moved)
	* src/sas/sasview/test/save_states/test.inv (moved)
	* src/sas/sasview/test/save_states/test002.inv (moved)
	* src/sas/sasview/test/sesans_data/sphere2micron.ses (moved)
	* src/sas/sasview/test/sesans_data/sphere_isis.ses (moved)
	* src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved)
	* src/sas/sasview/welcome_panel.py (moved)
	* src/sas/sasview/wxcruft.py (moved)

	Merge branch 'master' into ticket-887-reorg


Mon, 18 Sep 2017 13:43:24 GMT Paul Kienzle <pkienzle@…> [f12d96e]
	* src/sas/sascalc/corfunc/corfunc_calculator.py (modified)
	* src/sas/sascalc/corfunc/transform_thread.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* .pydevproject (modified)
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge remote-tracking branch 'repo-lewis/corfunc3d' into corfunc3d


Mon, 18 Sep 2017 03:52:57 GMT butler [6d62b7f]
	* sasview/images/dls_logo.png (moved)
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.spec (modified)
	* sasview/setup_exe.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)

	Merge remote-tracking branch 'origin/master' into 4_1_issues


Mon, 18 Sep 2017 03:46:04 GMT butler [412e9e8b]
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/load_image.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted)
	* src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added)

	Fix viewer documentation

	Replaced the three images for the ...


Sun, 17 Sep 2017 18:55:16 GMT butler [6479f3a]
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)

	Add file choice

	Add file choice of all allowed image files (as opposed ...


Sun, 17 Sep 2017 16:12:44 GMT butler [35d518f]
	* .pydevproject (modified)
	* README.md (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* setup.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (added)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/loader_exceptions.py (added)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (deleted)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/defaults.json (deleted)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/ascii2d_loader.py (added)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/fileconverter/test/cansas1d.xml (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.h5 (added)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_extension_registry.py (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (added)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/sasdataloader/test/valid_cansas_xml.xml (added)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/utest_sasview.py (modified)
	* sasview/images/dls_logo.png (moved)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)

	Merge remote-tracking branch 'origin/master' into ...


Sun, 17 Sep 2017 00:26:13 GMT butler [b01ac8f]
	* .pydevproject (modified)
	* README.md (modified)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/2d_data/Dec07031.ASC (deleted)
	* sasview/test/2d_data/HiResSAN14.ASC (deleted)
	* sasview/test/2d_data/MAR07262.ASC (deleted)
	* sasview/test/2d_data/SILIC009.ASC (deleted)
	* setup.py (modified)
	* src/sas/sascalc/data_util/registry.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/file_reader_base_class.py (added)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/loader_exceptions.py (added)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (deleted)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/defaults.json (deleted)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/ascii2d_loader.py (added)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added)
	* src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/fileconverter/test/cansas1d.xml (modified)
	* test/fileconverter/test/utest_nxcansas_writer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/test/AR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.ASC (deleted)
	* test/sasdataloader/test/MAR07232_rest.h5 (added)
	* test/sasdataloader/test/testLoad.py (deleted)
	* test/sasdataloader/test/testplugings.py (deleted)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_extension_registry.py (added)
	* test/sasdataloader/test/utest_generic_file_reader_class.py (added)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasdataloader/test/utest_sesans.py (modified)
	* test/sasdataloader/test/valid_cansas_xml.xml (added)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/utest_sasview.py (modified)
	* sasview/images/dls_logo.png (moved)
	* src/sas/sasgui/guiframe/images/angles.png (deleted)
	* src/sas/sasgui/guiframe/images/angles_flat.png (deleted)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/danse_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ess_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ill_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/isis_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nist_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/nsf_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/sns_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/umd_logo.png (deleted)
	* src/sas/sasgui/guiframe/images/utlogo.gif (deleted)

	Merge remote-tracking branch 'origin/master' into 969_about_box_logo


Fri, 15 Sep 2017 16:30:40 GMT smk78 [ca383a0]
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)

	Two small corrections to new plugin help