Merge branch 'master' into feature/05-new-design

Conflicts:
	js/services/video.js

index.html

@@ -84,7 +84,7 @@
                   Share this secret with your other copayers for them to join your wallet <br>
               </div>
               <div class="size-24">
-              <b>{{$root.wallet.getMyCopayerId()}}</b>
+              <b>{{$root.wallet.getSecret()}}</b>
               </div>
         </div>
       </div>
@@ -508,6 +508,7 @@
     <script src="lib/crypto-js/rollups/aes.js"></script>
     <script src="lib/file-saver/FileSaver.js"></script>
     <script src="lib/socket.io.js"></script>
+    <script src="lib/sjcl.js"></script>
     <script src="js/copayBundle.js"></script>
 
     <script src="js/app.js"></script>