cleanup
Merge branch 'master' of github.com:congajs/conga-framework