Check Multi

In the annotations control, the geometries are simple instead if in the
database it's multi.
Now we check if the geomtry in database is multi and we transform simple
geometry to multi.
Merge remote-tracking branch 'upstream/master'