sync
Fix conflicts
Merge branch 'dev' of github.com:GeographicaGS/Elcano-iepg into dev
Variable name
Merge branch 'dev' of https://github.com/GeographicaGS/elcano-iepg into dev
Ranking layout
Ranking
Whatever.
Blocks service changed.
Merge branch 'dev' of github.com:GeographicaGS/Elcano-iepg into dev-malkab