Resolve conflicts

Author: shekhar-cis

src/bitmessagekivy/baseclass/common.py

@@ -44,7 +44,7 @@
 
 def load_image_path():
     """Return the path of kivy images"""
-    image_path = os.path.abspath(os.path.join('images', 'kivy'))
+    image_path = os.path.abspath(os.path.join('pybitmessage', 'images', 'kivy'))
     return image_path
 
 

src/bitmessagekivy/main.kv

@@ -216,6 +216,8 @@ MDNavigationLayout:
             id:id_myaddress
         ScanScreen:
             id:id_scanscreen
+        Payment:
+            id:id_payment
     MDNavigationDrawer:
         id: nav_drawer
 

src/bitmessagekivy/screens_data.json

@@ -11,5 +11,10 @@
     "Scanner": {
         "kv_string": "scan_screen",
         "Import": "from pybitmessage.bitmessagekivy.baseclass.scan_screen import ScanScreen"
+    },
+    "Payment": {
+        "kv_string": "payment",
+        "name_screen": "payment",
+        "Import": "from pybitmessage.bitmessagekivy.baseclass.payment import Payment"
     }
 }