synchronization with dm branch
refactoring for better compatibility with multidir settings
Merge branch 'master' into beta
refactoring
Merge branch 'master' into beta
method renaming
Merge branch 'master' into beta
new resources
Merge branch 'master' into beta