change name of type attribute
Small fixes
Bug fix for acceptance tests
Merge with develop branch
Merge remote-tracking branch 'origin/develop' into develop
import type tree
import type tree
Merge branch 'AlexDenisenko' into develop
Added acceptance tests for creation and deletion type with subtypes.
Merge branch 'develop' into stanislav.skrebtsov
Added acceptance tests for creation and deletion type with subtypes.
Merge branch 'stanislav.skrebtsov' into develop
User can export Type Tree(XML)
User can export Type Tree(XML)
Merge branch 'polulyakh' into develop
Test fixes
Merge branch 'develop' into arkadiy.sychov
Fixes according with code review #2