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

Conflicts:
	Changes