Fix template directory mapping
Merge branch 'feature/modman_integration' into develop