Merge lp:~diegosarmentero/pay-ui/oxide into lp:pay-ui

[Diego Sarmentero]

- Using a different Web Component to fix scrolling and combos issues in the add credit card page.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:9
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/21/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'app/ui/UbuntuPurchaseWebkit.qml'
--- app/ui/UbuntuPurchaseWebkit.qml	2014-07-03 15:35:41 +0000
+++ app/ui/UbuntuPurchaseWebkit.qml	2014-07-03 15:35:41 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
-import com.canonical.Oxide 1.0
+import Ubuntu.Web 0.2
 
 
 Page {

=== modified file 'manifest.json'
--- manifest.json	2014-07-03 15:35:41 +0000
+++ manifest.json	2014-07-03 15:35:41 +0000
@@ -10,6 +10,6 @@
             "desktop": "payui.desktop"
         }
     },
-    "version": "0.2.5",
+    "version": "0.2.6",
     "maintainer": "Sarmentero Diego <[e-mail]>"
 }
\ No newline at end of file