Fix again
Fix again, and fix build system for integration
Merge branch 'master' of github.com:dabbler0/ice_editor_canvas
Merge branch 'master' of https://github.com/dabbler0/ice_editor_canvas