mantenimiento v1
Merge branch 'master' of https://github.com/OOliveros/UPC-DEW-ProyectoFinal-A41A

Conflicts:
	app/models/user.rb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/initializers/secret_token.rb
	db/schema.rb
	test/fixtures/users.yml
	test/functional/users_controller_test.rb