fixed conflict with pixtypes regarding cmb.js
Merge branch 'development' of https://github.com/pixelgrade/pixproof into development