modified imagecontroller
Merge branch 'development' of github.com:kaint-ohtu/ohtu into development