enabling cross domain resources (for CDN type usage)
builder bug fixes
returns between files to make build.js usable
Merge remote-tracking branch 'upstream/master'