Merge branch 'master' of https://github.com/Eyescale/Collage
Merge branch 'master' of https://github.com/Eyescale/Collage
Fix Bamboo build
Merge pull request #47 from eile/master

Fix Bamboo build