delete
admin.js.coffee
Merge remote-tracking branch 'origin/frontend_admin' into frontend_admin

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
cambios 1