Added missing JSON type information.
Added 2D versions of Line and Polygon classes.
Merge commit 'e4b44d2dd8a7b14c2bfd27316f789fd2a2be62f9'

Update in subproject.