Merge remote-tracking branch 'origin/master'

src/main/java/Event.java

src/main/java/GeoShape.java

src/main/java/Main.java

src/main/resources/testarray.json

src/test/resources/test.json