added icon.png
Merge master/master