Fix mapping of skin directory
Merge branch 'feature/modman_integration' into develop