change templates/layers structure
pyramid 1.5 compatibility
Merge branch 'scaffolds'
Merge branch 'pyramid15'