[general modificacion imagenes]
Merge branch 'master' of github.com:sarriagada/newinsignia4u

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