Merge pull request #133 from eile/master

Revert to lunchbox::sleep since boost::thread is broken in 1.56
Fix Win32 build
Merge pull request #134 from tribal-tec/master

Fix Win32 build
Fixing the linking of the tests on the Lugano cluster (missing boost::program_options symbols).
Merge pull request #135 from rdumusc/fix_lugano_build

Fixing the linking of the tests on the Lugano cluster.
Fix Win32 build
Fixing the linking of the tests on the Lugano cluster (missing boost::program_options symbols).
CMake external bump (nullptr OS X fix)
Merge branch 'master' of https://github.com/eile/Collage
CMake external bump (clangcheck target fix)
CMake external bump (clangcheck target fix)
Merge branch 'master' of https://github.com/eile/Collage

Conflicts:
	.gitexternals
Merge branch 'master' of https://github.com/Eyescale/Collage
Merge branch 'master' into superproject
Integrate Lunchbox as sub project