pulled in latest commits from yesterday, merged and handled conflicts

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-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>

public/views/onboarding/collectEmail.html

@@ -1,14 +1,14 @@
-<ion-view ng-controller="collectEmailController">
-  <ion-nav-bar class="bar-stable">
+<ion-view>
+  <ion-nav-bar class="bar-stable" ng-controller="backController">
     <ion-nav-buttons side="secondary">
-      <button class="button no-border" ng-click="skip()">
-        Skip
+      <button class="button no-border" ng-click="onboardingMailSkip()">
+        {{'Skip' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
-  <ion-content >
-    Wallet Created
-    Where would you like to receive email notifications about payments
+  <ion-content ng-controller="collectEmailController">
+    <span translate>Wallet Created </span>
+    <span translate>Where would you like to receive email notifications about payments </span>
     <form name="emailForm" ng-submit="save(emailForm)" novalidate>
       <input type="email" id="email" name="email" ng-model="email" required></input>
       <input type="submit" class="button button-block button-positive" value="{{'Save'|translate}}" ng-disabled="emailForm.$invalid">

public/views/onboarding/terms.html

@@ -1,6 +1,6 @@
 <ion-view id="terms-of-use">
-  <ion-nav-bar class="bar-light">
-    <ion-nav-title>Terms of Use</ion-nav-title>
+  <ion-nav-bar class="bar-ligt">
+    <ion-nav-title>{{'Terms of Use' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" href ui-sref="onboarding.disclaimer">
         <i class="icon ion-arrow-left-c"></i>

public/views/onboarding/tour.html

@@ -1,5 +1,5 @@
 <ion-view ng-controller="tourController" ng-init="init()" class="onboarding" id="onboard-tour">
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-stable">
     <ion-nav-title></ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="goBack()">
@@ -7,8 +7,8 @@
       </button>
     </ion-nav-buttons>
     <ion-nav-buttons side="secondary">
-      <button class="button no-border" ng-show="data.index == 0" ng-click="createProfile()">
-        Skip
+      <button class="button no-border" ng-show="data.index == 0" ng-click="createDefaultWallet()">
+        {{'Skip' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>

public/views/onboarding/welcome.html

@@ -1,5 +1,5 @@
 <ion-view id="onboard-welcome" class="onboarding">
-  <ion-content>
+  <ion-content ng-controller="welcomeController" ng-init="createProfile()">
     <img src="../img/onboarding-welcome-shopping24.png" id="shopping-24" />
     <div class="text-center">
       <div class="row">
@@ -16,6 +16,5 @@
       <div class="row">
         <button class="button button-block restore col col-75" translate>Restore</button>
       </div>
-    </div>
   </ion-content>
 </ion-view>