Merge pull request #128 from bilgili/master

Merging the the subproject
Merge pull request #129 from bilgili/master

Cleanup the tests/CMakeLists.txt
Merge pull request #130 from bilgili/master

Fix RH compilation issues
Fix VS2012 build
Merge pull request #131 from tribal-tec/master

Fix VS2012 build
Bump CMake subtree
Fix travis
Fix Boost 1.56 build
Merge pull request #132 from tribal-tec/master

Fix Boost 1.56 build
Revert to lunchbox::sleep since boost::thread is broken in 1.56
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)