update urls
Update README.md
add type and key to iframeurl
Merge branch 'master' into gh-pages

Conflicts:
	scripts/app.js