Merge from JiMin

It includes setting dialog that has sub dialog(General, Style setting).