correct images, move detection to usermodel
Merge branch 'develop' of https://github.com/deviator/horde into develop