synchronization with dm branch
refactoring for better compatibility with multidir settings
Merge branch 'master' into ice-cream-sandwich
refactoring
Merge branch 'master' into ice-cream-sandwich
method renaming
Merge branch 'master' into ice-cream-sandwich
new resources
Merge branch 'master' into ice-cream-sandwich