Merge branch 'refs/heads/gh-pages'
Geolocation function fixed
Update file structure and cleaned up code
Android Clean up
deleted files
Device data API finished
Final Week 4 Commit
Merge remote-tracking branch 'refs/remotes/origin/Working'
Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages