Merge remote branch 'ether/develop' into translateplugins

src/node/db/API.js

@@ -548,6 +548,19 @@ exports.sendClientsMessage = function (padID, msg, callback) {
   } );
 }
 
+/**
+checkToken() returns ok when api token is valid
+
+Example returns:
+
+{"code":0,"message":"ok","data":null}
+{"code":4,"message":"no or wrong API Key","data":null}
+*/
+exports.checkToken = function(callback)
+{
+  callback();
+}
+
 
 /******************************/
 /** INTERNAL HELPER FUNCTIONS */

src/node/handler/APIHandler.js

@@ -68,6 +68,7 @@ var version =
   , "isPasswordProtected"       : ["padID"]
   , "listAuthorsOfPad"          : ["padID"]
   , "padUsersCount"             : ["padID"]
+  , "checkToken"                : []
   }
 , "1.1":
   { "createGroup"               : []
@@ -102,6 +103,7 @@ var version =
   , "padUsers"                  : ["padID"]
   , "sendClientsMessage"        : ["padID", "msg"]
   , "listAllGroups"             : []
+  , "checkToken"                : []
   }
 };