merge master files
new demosite merge
zip files
added google jquery instead cloudflare, fix some bugs with new version of xtyle master