Merge branch 'web/lbkstudios/86'
GEM:88 Added borders to images.
Merge branch 'web/hotfix/88' into release/current