sdad
Merge remote-tracking branch 'origin/master' into frontend_admin

Conflicts:
	db/schema.rb
ghjgk
Merge remote-tracking branch 'origin/master' into frontend_admin

Conflicts:
	app/assets/javascripts/application.js
Merge remote-tracking branch 'origin/master' into frontend_admin
cambios
asd
Merge remote-tracking branch 'origin/master'
post