connect to locker server by default

config.js

@@ -18,10 +18,10 @@ var config = {
   },
   lockOpts: {
     //  To use locker-server, uncomment this:
-    // lockerServer: {
-    //   host: 'localhost',
-    //   port: 3231,
-    // },
+    lockerServer: {
+      host: 'localhost',
+      port: 3231,
+    },
   },
   messageBrokerOpts: {
     //  To use message broker server, uncomment this:

lib/blockchainmonitor.js

@@ -9,6 +9,8 @@ log.debug = log.verbose;
 var BlockchainExplorer = require('./blockchainexplorer');
 var Storage = require('./storage');
 var MessageBroker = require('./messagebroker');
+var Lock = require('./lock');
+var EmailService = require('./emailservice');
 
 var Notification = require('./model/notification');
 
@@ -84,7 +86,6 @@ BlockchainMonitor.prototype._initExplorer = function(provider, network, url) {
 
 BlockchainMonitor.prototype._handleIncommingTx = function(data) {
   var self = this;
-  var walletId = walletService.walletId;
 
   if (!data || !data.vout) return;
 

lib/templates/new_copayer.plain

@@ -0,0 +1,2 @@
+<%= subjectPrefix %>New copayer
+A new copayer just joined your wallet <%= walletName %>.