updated with uuid, jsonp and jsonp demo
Merge branch 'master' into gh-pages