Cambios varios
Merge branch 'wsn_integration'

Conflicts:
	app/controllers/landing_page_controller.rb