Fixed paths to properly display images.
Merge branch 'master' into mo-cleaning-skeleton