Update CMake subtree
Merge branch 'master' of https://github.com/Eyescale/Equalizer

Conflicts:
	.gitexternals
Merge pull request #336 from eile/master

Update CMake subtree