統合
Merge branch 'master' of https://github.com/valbeat/haewataru

Conflicts:
	Library/CurrentLayout.dwlt
ボタン画像の追加