Bugfix: use correct class
Merge remote-tracking branch 'upstream/master'
Added classes for images
Revert "Added classes for images"

This reverts commit fe31321b30a808b13723440a9194ff3b5bfb3e07.
Changed templates for left & right aligned images