Skins can now have page templates
Merge branch 'development'