Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_wallet_created

# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss

public/views/onboarding/backupRequest.html

@@ -14,7 +14,7 @@
       </p>
     </div>
     <div class="row text-center">
-      <i class="ion-arrow-down-c light-blue col col-60" id="arrow-down"></i>
+      <i class="ion-ios-arrow-thin-down light-blue col col-60" id="arrow-down"></i>
     </div>
     <div class="row">
       <button class="button button-block button-positive col-75 col" href ui-sref="onboarding.backupWarning" translate>Backup wallet</button>

public/views/onboarding/backupWarning.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
       <button class="button no-border" href ui-sref="onboarding.backupRequest">
-        <i class="icon ion-arrow-left-c"></i>
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>

public/views/onboarding/welcome.html

@@ -1,6 +1,6 @@
 <ion-view id="onboard-welcome" class="onboarding">
   <ion-content ng-controller="welcomeController" ng-init="createProfile()">
-    <img src="../img/onboarding-welcome-shopping24.png" id="shopping-24" />
+    <qr-scanner id="shopping-24" on-scan="goImport(data)"></qr-scanner>
     <div class="text-center">
       <div class="row">
         <img src='../../img/bitpay-logo.svg' class="logo col col-50" />
@@ -14,7 +14,7 @@
         <button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
       </div>
       <div class="row">
-        <button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
+        <button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
       </div>
   </ion-content>
 </ion-view>