adding synch template task
Merge branch 'master' into features/single-html-template
Merge branch 'master' into features/single-html-template
Merge branch 'master' into features/single-html-template
updating markers
replacing shell script with ruby script
updating templates
moving begin and end tags correctly
updating template synch script
Merge branch 'master' into features/squirrel-house-progress
updating template
updating layouts