parcial
[Refactoreo CSS]
[Refactoreo de CSS]
Merge branch 'refactoreo-css'

Conflicts:
	app/assets/stylesheets/device.css.scss