Add width and height attributes to img element.
Merge branch 'refs/heads/features/twitter-bootstrap' into develop
Merge branch 'refs/heads/develop'