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

# Conflicts:
#	public/views/onboarding/welcome.html

public/views/includes/walletActivity.html

@@ -9,7 +9,7 @@
   </div>
 
   <div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
-      <span>Payment Sent </span>
+      <span translate>Payment Sent </span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
       </div>
@@ -18,7 +18,7 @@
 
 
   <div ng-if="x.types.indexOf('NewIncomingTx')>=0">
-      <span>Payment Received</span>
+      <span translate>Payment Received</span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
       </div>
@@ -26,12 +26,12 @@
 
   <div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    Proposal Deleted
+    <span translate>Proposal Deleted</span>
   </div>
 
   <div ng-if="x.types.indexOf('TxProposalRejected')>=0">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    Proposal Rejected
+    <span translate>Proposal Rejected</span>
   </div>
 
   <div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
@@ -43,7 +43,7 @@
     </span>
     <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1  && x.types.indexOf('NewOutgoingTx')==-1">
       <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
-      Proposal Accepted
+      <span translate>Proposal Accepted</span>
     </span>
   </div>