Fix two small issues

- Don't search the default directory twice if the skin is set to default
- Corrected the misspelled "common" directory name
Merge branch 'add_template_inheritance'