Fix right margin / image border issue.

Fixes #556.
Revert "Fix right margin / image border issue."

This reverts commit cc9a209b253325d67334a1b502ae4574c6a3807f.
Previous fix for img border didnt work in editor.

Now we use the 'outline' css property to draw the image_frame border.
sorl thumbnail version custom4.

Fixes #555.