コード整理。
Merge branch 'trunk' of https://github.com/ProjectAsura/Salty into trunk