Fix Ubuntu clang build
Merge pull request #94 from tribal-tec/master

Fix Ubuntu clang build
Merge pull request #95 from eile/master

Fix build after latest lunchbox change
Merge branch 'master' of https://github.com/Eyescale/Collage