Merge branch 'bd_sprint2' into interface_supervisor
web_service_controller arrumado
web_service_controller arrumado
Merge branch 'ws_campo' into testes
Merge branch 'ws_atlas' into testes
Merge branch 'interface_supervisor' into testes