Fixed crash issue on phone. still working on jsonp issue
Final commit for Project 2
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages