Update CodeBlocks project
Merge branch 'merge-up-int' of https://github.com/martinmoene/Catch into merge-up-int