added image controller
fixed image controller
Fixed
added display
Merge branch 'development'