Changing to Google CDN
Fixing merge conflicts