#79: Fixed cropping and display of images
#79: Fixed image style
Merge branch 'sprint2_jwf_2'