ぬるぽエラーを修復．その他，プログラムの整理．
Merge branch 'master' of ssh://git@github.com/kobasemi/PacketArt.git
Merge branch 'master' of https://github.com/kobasemi/PacketArt into PlaySetting

Conflicts:
	src/jp/ac/kansai_u/kutc/firefly/packetArt/setting/MusicVolumePanel.java
	src/jp/ac/kansai_u/kutc/firefly/packetArt/setting/SettingForm.java