Working on jsonp issue with phone and gh-pages
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages