Fixes #186
All areas are merged. Polygons and circles are put inside a single area element.
Additionally, state list for the "estados" parameter is now built using a hashset to avoid duplicate state IDs.
The element "areaDesc" is now the state list and the old "areaDesc" is now a parameter called "trayectoria".