Adição da coluna floor na tabela Inspection
Adição da coluna id_place na tabela Inspection
Inspection.approved nas telas de equipment e inspection
ws: get_usp_png, get_usp_map_info, get_num_pav, get_building_png, get_building_info, get_id_by_coordinate
WS novo para auxiliar teste do mobile
Merge branch 'ws_atlas' of https://github.com/rafalee/hera into ws_atlas
Merge branch 'ws_atlas' of https://github.com/rafalee/hera into ws_atlas

Conflicts:
	rails_app/hera/app/controllers/web_services_controller.rb
	rails_app/hera/config/routes.rb
fixtures working
Filtros em ordem alfabetico
Aprovacao unica
Bunit3z4 0.1
melhoramentos do bd de testes
Autenticacao simples, username: admin, password: admin
Seeds e view com Estado de Conservacao
ws: get_gml_by_code adicionado, algumas correcoes tb foram feitas nos demais ws
Merge branch 'ws_atlas' of https://github.com/rafalee/hera into ws_atlas

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

Conflicts:
	rails_app/hera/config/routes.rb
Merge branch 'ws_campo' into testes
Merge branch 'ws_atlas' into testes
migrated
Estado de conservacao no index do equipamento
Merge branch 'interface_supervisor' into testes