Merge branch 'master' into forget-suscripciones

Conflicts:
	Gemfile.lock