n
Merge branch 'ws_campo' of https://github.com/rafalee/hera into ws_campo

Conflicts:
	rails_app/hera/test/controllers/web_services_controller_test.rb