ミニアイコン用画像変更
Merge remote-tracking branch 'origin/master' into first-dev

Conflicts:
	sample-mini.png