Re-added Polygon class
Merge commit '3431e6318bbe38fe300784e4f7726e2bdc1a751e'

Subtree merge
Added Json annotations.
Classpath change.
Classpath change.
Classpath change.
Added Json annotations.
Merge commit '75160e296c680d65abf17d52d120bf7dcb2f7396'

Merged updates from upstream
Merge commit 'e80f9c1c20ec2e935e2fa7190be69663c3c7bfd1'

Merged updates from upstream.
Merge commit 'acdedffb19d4f986a5cca9be60411125b956029d'

Merged updates from upstream.
Merge commit '7d0ab335782291d57a1ec84639df0461948ea7c2'

Merged updates from upstream
Merge commit '50817587f2c9b40305d2892330c1fc0601f317f4'

Merged updates from upstream.