Fixed image paths
Merge branch 'development' into test