Merge branch 'master' into gh-pages
Cleaning up files
Google Maps is working
Google Maps is working
Fixes
Fixes
More fixes
Still more fixes
And yet more fixes
Tons of changes
Changed project files
Merge branch 'gh-pages'