Merge commit '647650de48d27934e0eb018db1c0ff4242ee39a5' into develop

# Conflicts:
#	src/main/protos/core/Tron.proto

core/Tron.proto

@@ -31,6 +31,7 @@ message Account {
     // the vote num to this super rep.
     int64 vote_count = 2;
   }
+
   bytes account_name = 1;
   AccountType type = 2;
   // the create adress
@@ -54,6 +55,11 @@ message acuthrity {
   bytes permission_name = 2;
 }
 
+
+message permision {
+  AccountId account = 1;
+}
+
 // Witness
 message Witness {
   bytes address = 1;
@@ -107,6 +113,7 @@ message Transaction {
       DeployContract = 7;
       WitnessUpdateContract = 8;
       ParticipateAssetIssueContract = 9;
+      AccountUpdateContract = 10;
       CustomContract = 20;
     }
     ContractType type = 1;
@@ -244,4 +251,5 @@ message DisconnectMessage {
 message HelloMessage {
   Endpoint from = 1;
   int32 version = 2;
+  int64 timestamp = 3;
 }