update icon
Merge branch 'master' of https://github.com/Sets88/xbmc-cherrymusic
Merge branch 'master' into devel

Conflicts:
	icon.png