fix merge branch
Merge branch 'master' into publish
Update submodule
Update submodule config
Edit update_site_on_git.php