inheritance refactoring in fsmapping
Merge branch 'morph-develop' of github.com:G-Node/MorphDepot into morph-develop