fix final de envio de mails
commit para obtener los cambios de otros
Merge branch 'development' of github.com:sbianchi/wira into development
commit para pull
Merge branch 'development' of github.com:sbianchi/wira into development

Conflicts:
	app/controllers/invitations_controller.rb
	app/mailers/mailsender.rb
	app/views/invitations/new.html.erb
	config/routes.rb