added app icon
fix problem commit
Merge remote-tracking branch 'origin/master'
fixed conflict from merge from origin