ERT-622 Removed forecast analysed choice as requested by user
Merge pull request #531 from iLoop2/ERT-622

ERT-622 Removed forecast analysed choice as requested by user
Merge pull request #529 from iLoop2/ERT-605

Ert 605 Manual load of results
ERT-664 - FMU: Point in polygon test. Added support for 2D lines in polyline
ERT-664 - FMU: Point in polygon test
ERT-664 - Missing entry for test in CMakeLists.txt
Merge pull request #532 from jepebe/ERT-664

Ert 664 Point in polygon test
ERT-664 - Support for 3 element coordinates
Merge pull request #533 from jepebe/ERT-664

ERT-664 - Support for 3 element coordinates
ERT-652 Added support for gen param
ERT-673: Fixed bug in matrix_diag_std()
ERT-672 Disable export button if no keywords found to export
Merge pull request #534 from joakim-hove/ERT-673-matrix-diag-std

ERT-673: Fixed bug in matrix_diag_std()
Introduced a new fs pointer, to separate reading fs and writing fs for active_list.
Merge pull request #535 from iLoop2/ERT-674

ERT-672 Export bug: missing realisations?
ERT-652 Added exporter to figure out export method
ERT-652 Refactor out the export logic from the GUI
Merge pull request #536 from flikka/ERT-667-segfault

Introduced a new fs pointer, to separate reading fs and writing fs for a...
Merge remote-tracking branch 'upstream/master' into ERT-652

Conflicts:
	devel/python/python/ert_gui/tools/export/export_tool.py
ERT-652 Fix after merge