Fix conflict
Merge pull request #31 from nacyot/minor-change

Minor changes
Merge branch 'master' of github.com:subicura/bb-ng into korean
Merge pull request #32 from nacyot/korean

인터페이스 한글화
Merge upstream master