Cambios al esqueleto puntuales
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/Gemfile
	project/Gemfile.lock