user state
Merge remote-tracking branch 'origin/master'
Added images to segment controller