bomb
merge conflict fixed
icon added
icon added to config.xml
Merge branch 'master'