Limpando workspace de testes
Arrumando metodos e rotas do Validate (agora Approve) e o disapprove - metodos do controller do equipment e inspections
Agora default de current é true
Ajuste na tabulação das views
Deletei o arquivo _main_nav que era de backup
antigos ws deletados - parte Samuel
Arrumei a logica do is_ok para ficar igual a documentacao. 0 = Não, 1 = Sim, 2 = Não se aplica
WEBPOST ok
Testes corrigidos
Merge branch 'ws_campo' of https://github.com/rafalee/hera into ws_campo
Foto url não é mais obrigatório no inspections
Merge branch 'ws_openlayers' into testes

Conflicts:
	rails_app/hera/app/controllers/web_services_controller.rb
Merge branch 'interface_supervisor' into testes

Conflicts:
	rails_app/hera/config/routes.rb
Merge branch 'ws_atlas' into testes

Conflicts:
	rails_app/hera/test/controllers/web_services_controller_test.rb
	rails_app/hera/test/fixtures/answer.yml
	rails_app/hera/test/fixtures/inspections.yml
Merge branch 'bd_sprint2' into testes
Merge branch 'ws_campo' into testes

Conflicts:
	rails_app/hera/config/routes.rb
Testes corrigidos
Resposta do getbuildingName em xml
Merge branch 'ws_campo' of https://github.com/rafalee/hera into ws_campo
Merge branch 'ws_campo' into testes

Conflicts:
	rails_app/hera/app/controllers/equipment_controller.rb
	rails_app/hera/app/views/inspections/_search.html.erb
	rails_app/hera/test/fixtures/inspections.yml