Using image-url instead image_url to prevent wrong image paths on rails 4

On a rails 4 app having "config.assets.digest = true". The "image_url" on the mixin outputs the css asset name without the fingerprinted names. And that makes the image does not appear.
Fix merge conflict