Merge branch 'v0.6' into fix#3

Author: lakshyacis

src/bitmessageqt/__init__.py

@@ -5,22 +5,25 @@
 
 from PyQt4 import QtGui
 
-from version import softwareVersion
-
 import paths
 import widgets
 from address_dialogs import (
-    AddAddressDialog, EmailGatewayDialog, NewAddressDialog, NewSubscriptionDialog, RegenerateAddressesDialog,
+    AddAddressDialog, EmailGatewayDialog, NewAddressDialog,
+    NewSubscriptionDialog, RegenerateAddressesDialog,
     SpecialAddressBehaviorDialog
 )
 from newchandialog import NewChanDialog
 from retranslateui import RetranslateMixin
+from settings import SettingsDialog
 from tr import _translate
+from version import softwareVersion
+
 
 __all__ = [
     "NewChanDialog", "AddAddressDialog", "NewAddressDialog",
     "NewSubscriptionDialog", "RegenerateAddressesDialog",
-    "SpecialAddressBehaviorDialog", "EmailGatewayDialog"
+    "SpecialAddressBehaviorDialog", "EmailGatewayDialog",
+    "SettingsDialog"
 ]