add scaffold support
add scaffold content
Merge branch 'develoment' into scaffold-map