Forgot one file
Ignore build-catalog and some testresults
Merge branch 'master' into gui
More modifications to the gui. Mainly removing defunct function calls
Some more defuct functions removed. Some changes to enkf_test.py
Added safe prototype functionality
Merge branch 'version-1.1' into gui

Conflicts:
	devel/python/python/ert/ecl/CMakeLists.txt
Fixed two of the tests in enkf_test.py
Merge remote branch 'inge/gui' into gui
Moved the ert_gui hierarchy besides the normal ert/ hierarchy