Change markup to allow nice bordered images.
Merge branch 'master' of http://git.hoa.io/W3