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
Update generated files
Update generated files
Release 1.1.2
Merge pull request #138 from bilgili/master

Release 1.1.2
Update generated files for 2014.R3
Merge pull request #139 from rdumusc/master

Update generated files for 2014.R3
Increase error output
Expose addConnection() for local server connections in Equalizer