change logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/img/icon.png