Added proxy file for x-domain frames
Updated proxy.html to include x-domain JS
Updated x-domain JS with correct 'master' attribute
Merge branch 'master' into gh-pages