Fix Conflicts:

css/main.css
	views/modals/qr-address.html

views/join.html

@@ -46,6 +46,7 @@
               </div>
             </div>
 
+            <div style="clear: both;"></div>
             <label for="joinPassword"> User info </label>
             <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
             <input type="password" class="form-control"

views/modals/qr-address.html

@@ -1,19 +1,17 @@
 <div class="text-center">
-  <qrcode size="160" data="bitcoin:{{address.address}}"></qrcode>
-  <h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
+  <qrcode size="250" data="{{address.address}}"></qrcode>
 
-  <div>
+  <div class="m10t">
+    <h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
     <span ng-if="$root.updatingBalance">
       <i class="fi-bitcoin-circle icon-rotate spinner"></i>
     </span>
-    <span ng-if="!$root.updatingBalance">
+    <p class="m15b" ng-if="!$root.updatingBalance">
       {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
-    </span>
-    <div style="margin-top:10px;">
-      <span class="label pointer" open-external address="{{address.address}}">
-        <i class="fi-link">&nbsp;</i> Open in external application
-      </span>
-    </div>
+    </p>
+    <button class="m15t button secondary" open-external address="{{address.address}}">
+      <i class="fi-link">&nbsp;</i> Open in external aplication
+    </button>
   </div>
 </div>
 <a class="close-reveal-modal" ng-click="cancel()">&#215;</a>