Minor cleanup
Update generated files
Merge pull request #97 from hernando/master

CMake updates, removed unnecessary files and fixed deprecation warnings
Merge branch 'master' of https://github.com/Eyescale/Collage

Conflicts:
	tests/command.cpp
Restore perf functionality in command unit test
Fix deprecations in command unit test
Update generated files
Merge pull request #100 from eile/master

Restore perf functionality in command unit test
Fix for a regression introduced at 14cea94