Merge remote-tracking branch 'upstream/master' into plotting
Merge remote-tracking branch 'upstream/master' into plotting
Added plotting of refcase
Merge remote-tracking branch 'upstream/master' into plotting

Conflicts:
	devel/python/python/ert/enkf/ecl_config.py
	devel/python/python/ert/util/CMakeLists.txt
	devel/python/test/ert_tests/enkf/test_enkf_library.py
Fixed a merge error.
Missing CMakeLists entry
Merge pull request #234 from jepebe/plotting

Plotting