Minor change to image URL
Merge branch 'master' of github.com:fergalmoran/dss
Fixed line ending
Fixed git conflict in MixResource