Refactoring code - Change query of Area by Planta
Merge branch 'dev' of https://github.com/sabitinc/sga into dev