[AI-489] Updated point layers to use centroid of minimum bounding boxes if available
[AI-489] Compilation error fixes
Merge branch 'release' into version3

Conflicts:
	server/src/main/java/org/activityinfo/server/report/generator/map/PointLayerGenerator.java