borlox (7):
      5f55299: - some refactoring
      7ef16ec: - refac of options table creation
      6909d6c: -removed some debugging artifacts
      581c8ca: Fixed merge conflicts
      ebba849: - reorderd settings in gui
      602160d: Removed some unused entries
      7303ed1: - updated koKR locale (thanks sayclub)

