Bump version in package.json
Fix tiles to work
Merge remote-tracking branch 'upstream/master'