clean up
improve import performance by disabling block recursion tests

provide separate maps in memory storage for blocks and layers
Merge branch 'master' of github.com:qcad/qcad