UserImageDisplay.cs modified
Merge branch 'master' into mathura_dev