added custom-webscripts branch content (git merge failed)