semi-related bug fix #924: missing template will trigger onSite404 when on home page
Merge pull request #938 from stevewithington/develop

semi-related bug fix #924: missing template will trigger onSite404 when ...
Merge branch 'develop'
Working on onMissingInclude logic
Merge branch 'develop'
Fix for issue #940
Fixing issue with not providing a datasource
Fixing issue with not providing a datasource
Merge branch 'develop'
Fixing issue with not providing a datasource
Merge branch 'develop'