Merge branch 'master' into typedescription

Conflicts:
	src/server/ua_server.c

src/server/ua_securechannel_manager.c

@@ -62,6 +62,9 @@ UA_StatusCode UA_SecureChannelManager_open(UA_SecureChannelManager           *cm
     if(!entry) return UA_STATUSCODE_BADOUTOFMEMORY;
     UA_SecureChannel_init(&entry->channel);
 
+    response->responseHeader.stringTableSize = 0;
+    response->responseHeader.timestamp       = UA_DateTime_now();
+
     entry->channel.connection = conn;
     conn->channel = &entry->channel;
     entry->channel.securityToken.channelId       = cm->lastChannelId++;

src/server/ua_server.c

@@ -124,7 +124,7 @@ UA_Server * UA_Server_new(void) {
 
 #define MAXCHANNELCOUNT 100
 #define STARTCHANNELID 1
-#define TOKENLIFETIME 6000000
+#define TOKENLIFETIME 600000
 #define STARTTOKENID 1
     UA_SecureChannelManager_init(&server->secureChannelManager, MAXCHANNELCOUNT,
                                  TOKENLIFETIME, STARTCHANNELID, STARTTOKENID);