Merge branch 'release/2.2' into 'develop'

fix sql data

See merge request !89

data/maarchRM/batch/0-token.txt

-AUTH=ABjHAkI20y/RfLQ6YqkFhI4YnGDQ+ITnofYu5TFmNIVzuVb5Yqhf1HcQnh30E66zin6CPK90fBI=
+AUTH=phdF9WkJuTKkDuPXoqDZuOjLMAFGC6ZrzrSEEqC9YjJN9CZUNWsAOPn1I+PaDT2+g3S2i2/qgt5/Wo4ra68GTAfXSmzR8+IraIzVgvp4+7cQHvlfg7zofQ==
\ No newline at end of file
+

data/maarchRM/sql/pgsql/demo.sql

@@ -333,7 +333,7 @@ INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName
 INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName", "title", "displayName", "accountName", "emailAddress", "password","enabled","passwordChangeRequired","passwordLastChange", "locked", "badPasswordCount","lastLogin","lastIp","replacingUserAccountId") VALUES ('user', 'ddur', 'DUR', 'Dominique', 'Mme', 'Dominique DUR', 'ddur', 'info@maarch.org', 'fffd2272074225feae229658e248b81529639e6199051abdeb49b6ed60adf13d',true,false,null,false,0,null,null,null);
 INSERT INTO "auth"."account" ("accountType", "accountId", "lastName", "firstName", "title", "displayName", "accountName", "emailAddress", "password","enabled","passwordChangeRequired","passwordLastChange", "locked", "badPasswordCount","lastLogin","lastIp","replacingUserAccountId") VALUES ('user', 'ssissoko', 'SISSOKO', 'Sylvain', 'M.', 'Sylvain SISSOKO', 'ssissoko', 'info@maarch.org', 'fffd2272074225feae229658e248b81529639e6199051abdeb49b6ed60adf13d',true,false,null,false,0,null,null,null);
 
-INSERT INTO "auth"."account" ("accountType", "accountId", "displayName", "accountName", "emailAddress", "enabled") VALUES ('service', 'System', 'Système', 'Systeme', 'info@maarch.org', true);
+INSERT INTO "auth"."account" ("accountType", "accountId", "displayName", "accountName", "emailAddress", "password", "salt", "tokenDate", "enabled") VALUES ('service', 'System', 'Système', 'Systeme', 'info@maarch.org', 'phdF9WkJuTKkDuPXoqDZuOjLMAFGC6ZrzrSEEqC9YjJN9CZUNWsAOPn1I+PaDT2+g3S2i2/qgt5/Wo4ra68GTAfXSmzR8+IraIzVgvp4+7cQHvlfg7zofQ==', '5440ff64f62bfb39300fc4d46451f5a2', '2018-06-21 09:12:24.256064', true);
 
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('ppetit', 'ACME', '', true);
 INSERT INTO "organization"."userPosition" ("userAccountId", "orgId", "function", "default") VALUES ('aadams', 'DESR', '', true);