Added icon
Merge remote-tracking branch 'ddx/master'
Rebase
Merge remote-tracking branch 'ddx/master'
Added server set image parsing