Forma errada de se definir rotas em equipment index, ver restful resources
Arrumado rota do equipment show
Removido rota de equipment listagem, se nao usa deve ser removido
Arrumado controller de inspections para ficar de forma correta
feito WS para o mobile consumir e pegar os dados de todos os equipamentos
Feita as alteracoes do Rafael Lee
Merge branch 'bd_sprint2' into interface_supervisor
Espero ter resolvido todos os conflitos

Conflicts:
	rails_app/hera/app/controllers/equipment_controller.rb
	rails_app/hera/app/controllers/inspections_controller.rb
	rails_app/hera/app/views/equipment/index.html.erb
	rails_app/hera/app/views/inspection/_search.html.erb
	rails_app/hera/app/views/inspections/_search.html.erb
	rails_app/hera/app/views/inspections/_search.html.erb.orig
	rails_app/hera/app/views/inspections/index.html.erb
	rails_app/hera/app/views/inspections/show.html.erb
	rails_app/hera/app/views/layouts/_main_nav.html.erb
	rails_app/hera/config/routes.rb
Merge branch 'interface_supervisor' of https://github.com/rafalee/hera into interface_supervisor
Tentando limpar a casa

Conflicts:
	rails_app/hera/app/controllers/equipment_controller.rb
	rails_app/hera/app/views/inspection/index_history
	rails_app/hera/app/views/inspection/index_history.html.erb
	rails_app/hera/app/views/inspections/_search.html.erb
	rails_app/hera/app/views/inspections/index.html.erb
	rails_app/hera/app/views/inspections/index_history.html.erb