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