Check for website existance
Merge pull request #442 from G5/fix-update-78070320

Check for website existance
Check for template
Merge master and fix conflicts