[core] CATMAID changes
[core[ Fixing merge issues
Merge branch 'kunal-neworg-devel' of git://github.com/openconnectome/open-connectome into kunal-neworg-devel
[core] Bug Fixes to RGB32 catmaid support