pulled in latest commits from yesterday, merged and handled conflicts

src/sass/main.scss

@@ -3,6 +3,9 @@
  * Copay main CSS
  *
  */
+ body {
+  font-family: 'roboto-regular';
+}
 
 h3.title {
   margin-left: 10px !important;
@@ -882,6 +885,14 @@ input[type=file] {
   text-align: left;
 }
 
+.right {
+  float: right;
+}
+
+.left {
+  float: left;
+}
+
 .input-label {
   max-width: none;
   width: inherit;
@@ -994,3 +1005,6 @@ input[type=number] {
 
 @import 'mixins/mixins';
 @import 'views/onboarding/onboarding';
+@import "views/common";
+@import "views/tab-home";
+@import "views/includes/walletActivity";

src/sass/views/common.scss

@@ -0,0 +1,27 @@
+.icon.nav-item-arrow-right {
+  color: #666;
+  font-size: 26px;
+}
+
+.item.item-heading {
+  font-weight: bold;
+}
+
+.icon.list-add-button {
+  color: #666;
+  font-size: 38px;
+}
+
+.item.item-big-icon-left {
+  padding-left: 74px;
+}
+
+.icon.big-icon-svg {
+  padding: 0 7px;
+  > img {
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
+  }
+}

src/sass/views/includes/walletActivity.scss

@@ -0,0 +1,27 @@
+.wallet-activity {
+
+  &-amount {
+    float: right;
+    font-size: 18px;
+  }
+
+  &-note {
+    margin-top: 3px;
+    font-size: 12px!important;
+
+    &-child {
+      line-height: 30px;
+      vertical-align: middle;
+    }
+
+    > i {
+      font-size: 21px;
+      margin-right: 8px;
+    }
+
+    > time {
+      float: right;
+    }
+  }
+
+}

src/sass/views/tab-home.scss

@@ -0,0 +1,22 @@
+#tab-home {
+  .icon-create-wallet {
+    background-image: url("../img/icon-bitcoin.svg");
+    background-repeat:no-repeat;
+    background-position: -5px -5px;
+  }
+  .icon-buy-bitcoin {
+    background-image: url("../img/icon-gift.svg");
+    background-repeat: no-repeat;
+    background-position: -5px -6px;
+  }
+  .icon-bitpay-card {
+    background-image: url("../img/icon-bitpay.svg");
+    background-repeat: no-repeat;
+    background-position: -5px -6px;
+  }
+  .icon-gift {
+    background-image: url("../img/icon-gift.svg");
+    background-repeat: no-repeat;
+    background-position: -5px -6px;
+  }
+}