A demo of a syntax highlighting IDE configuration tool
Updated CMakeLists.txt
Merge remote-tracking branch 'upstream/master' into ide_demo
Updated how config files are loaded
Merge branch 'ide_demo' into ide_configuration

Conflicts:
	devel/python/python/ert_gui/pages/plot_panel.py
ERT-359 - Create simple syntax highlighting without low-level ERT validation

Partial refactoring of tokens and definitions
Fix compilation on Windows.

Remove fancy enum initialization used to ensure that the same return values where used in C and Python.

The return values where already hard-coded, also in Python, and we now have a unit-test that checks that the return-values correspond.
Do not build test_work_area on Windows.
fix deadlock bug in util_abort for very long (C++) function named
Refactored code testing state transitions: allowed STATE_PARENT_FAILURE -> STATE_PARENT_FAULRE
Merge pull request #239 from andlaus/fix_util_abort_gnu

fix deadlock bug in util_abort for very long (C++) function named
ERT-359 - Create simple syntax highlighting without low-level ERT validation

Refactor of ConfigurationLine completed.
ERT-359 - Create simple syntax highlighting without low-level ERT validation

Updated highlighter to use refactored ConfigurationLine
Added argument types: float, bool and path and added some more keywords
Missing CMakeLists and ctest tests
Merge pull request #242 from jepebe/ide_configuration

Ide configuration
Merge pull request #241 from perroe/windows_compile

Windows compile
Updated ui_return test to remove enum testing
Merge pull request #243 from joakim-hove/ui-return-build-failure

Updated ui_return test to remove enum testing
Merge pull request #240 from joakim-hove/allow-PARENT-FAILURE-2-PARENT-FAILURE

Allow state change STATE_PARENT_FAILURE -> STATE_PARENT_FAILURE