Updating version and changes.
Updating version and changes.
Merge branch 'master' of https://github.com/ImageEngine/gaffer

Conflicts:
	Changes
Reordering dependency includes at IE.

Now that we're using OpenEXR 2.1.0 across the board, we need those includes to come before the app specific ones, in case some app (Houdini 13) is using a different OpenEXR 2+ version, but did build with a versioned namespace...
Updated default Cortex version to 9.0.0-a5.
gui app: added error tolerant script loading from the command line
added todo about displaying load errors in a dialog
Merge pull request #978 from davidsminor/errorTolerantCommandLineScript

gui app: added error tolerant script loading from the command line
Merge remote-tracking branch 'upstream/master'