Merge branch 'hotfix/404-update'
Add setup instructions for new and existing Jekyll sites
Change source order of AdobeEdge fonts and CSS in head
Merge branch 'hotfix/optimize'
Merge branch 'hotfix/optimize' into develop
Merge branch 'master' into develop