Merge remote-tracking branch 'upstream/master'

Conflicts:
	doc/html/classRedmatrix_1_1Import_1_1Import-members.html
	doc/html/classRedmatrix_1_1Import_1_1Import.js

1 files changed, 66 insertions, 54 deletions

diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js
index 9df281b10..7450e7af0 100644
--- a/doc/html/navtreeindex9.js
+++ b/doc/html/navtreeindex9.js
@@ -1,5 +1,17 @@
 var NAVTREEINDEX9 =
 {
+"text_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,0,81,36],
+"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[6,0,0,81,33],
+"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[6,0,0,81,17],
+"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[6,0,0,81,61],
+"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[6,0,0,81,41],
+"text_8php.html#aac0969ae09853205992ba06ab9f9f61a":[6,0,0,81,32],
+"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[6,0,0,81,96],
+"text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447":[6,0,0,81,75],
+"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[6,0,0,81,91],
+"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[6,0,0,81,94],
+"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[6,0,0,81,62],
+"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[6,0,0,81,42],
 "text_8php.html#ac2ff88e800f74b22e9cc091c10809c54":[6,0,0,81,82],
 "text_8php.html#ace3c98538c63e09b70a363210b414112":[6,0,0,81,22],
 "text_8php.html#acedb584f65114a33f389efb796172a91":[6,0,0,81,2],
@@ -25,14 +37,14 @@ var NAVTREEINDEX9 =
 "theme_2mytheme_2php_2default_8php.html":[6,0,3,1,2,0,0],
 "theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,2,0,0,0],
 "theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,3,0,3],
-"thing_8php.html":[6,0,1,120],
-"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,120,0],
-"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,120,1],
+"thing_8php.html":[6,0,1,122],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,122,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,122,1],
 "todo.html":[3],
-"toggle__mobile_8php.html":[6,0,1,121],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,121,0],
-"toggle__safesearch_8php.html":[6,0,1,122],
-"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,122,0],
+"toggle__mobile_8php.html":[6,0,1,123],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,123,0],
+"toggle__safesearch_8php.html":[6,0,1,124],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,124,0],
 "tpldebug_8php.html":[6,0,2,7],
 "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,7,0],
 "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,7,1],
@@ -46,19 +58,19 @@ var NAVTREEINDEX9 =
 "typohelper_8php.html":[6,0,2,9],
 "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,9,0],
 "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,9,1],
-"uexport_8php.html":[6,0,1,123],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,123,1],
-"uexport_8php.html#ae6f79d60916c01675c8cf663cb5fec84":[6,0,1,123,0],
-"update__channel_8php.html":[6,0,1,124],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,124,0],
-"update__display_8php.html":[6,0,1,125],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,125,0],
-"update__home_8php.html":[6,0,1,126],
-"update__home_8php.html#a668340089acd150b830134476a647d05":[6,0,1,126,0],
-"update__network_8php.html":[6,0,1,127],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,127,0],
-"update__search_8php.html":[6,0,1,128],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,128,0],
+"uexport_8php.html":[6,0,1,125],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,125,1],
+"uexport_8php.html#ae6f79d60916c01675c8cf663cb5fec84":[6,0,1,125,0],
+"update__channel_8php.html":[6,0,1,126],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,126,0],
+"update__display_8php.html":[6,0,1,127],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,127,0],
+"update__home_8php.html":[6,0,1,128],
+"update__home_8php.html#a668340089acd150b830134476a647d05":[6,0,1,128,0],
+"update__network_8php.html":[6,0,1,129],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,129,0],
+"update__search_8php.html":[6,0,1,130],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,130,0],
 "updatetpl_8py.html":[6,0,2,10],
 "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,10,5],
 "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,10,2],
@@ -74,28 +86,28 @@ var NAVTREEINDEX9 =
 "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,3,0,0,0],
 "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,3,0,0,1],
 "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,3,0,0,2],
-"view_8php.html":[6,0,1,129],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,129,0],
-"viewconnections_8php.html":[6,0,1,130],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,130,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,130,0],
-"viewsrc_8php.html":[6,0,1,131],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,131,0],
-"vote_8php.html":[6,0,1,132],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,132,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,132,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,132,1],
-"wall__attach_8php.html":[6,0,1,133],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,133,0],
-"wall__upload_8php.html":[6,0,1,134],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,134,0],
-"webfinger_8php.html":[6,0,1,135],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,135,0],
-"webpages_8php.html":[6,0,1,136],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,136,0],
-"webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7":[6,0,1,136,1],
-"wfinger_8php.html":[6,0,1,137],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,137,0],
+"view_8php.html":[6,0,1,131],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,131,0],
+"viewconnections_8php.html":[6,0,1,132],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,132,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,132,0],
+"viewsrc_8php.html":[6,0,1,133],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,133,0],
+"vote_8php.html":[6,0,1,134],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,134,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,134,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,134,1],
+"wall__attach_8php.html":[6,0,1,135],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,135,0],
+"wall__upload_8php.html":[6,0,1,136],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,136,0],
+"webfinger_8php.html":[6,0,1,137],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,137,0],
+"webpages_8php.html":[6,0,1,138],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,138,0],
+"webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7":[6,0,1,138,1],
+"wfinger_8php.html":[6,0,1,139],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,139,0],
 "widedarkness_8php.html":[6,0,3,1,0,2,10],
 "widgets_8php.html":[6,0,0,82],
 "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,82,12],
@@ -131,14 +143,14 @@ var NAVTREEINDEX9 =
 "widgets_8php.html#af8eb466ef91d9e96e13335ead5eba380":[6,0,0,82,23],
 "widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5":[6,0,0,82,4],
 "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,82,18],
-"xchan_8php.html":[6,0,1,138],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,138,0],
-"xrd_8php.html":[6,0,1,139],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,139,0],
-"xref_8php.html":[6,0,1,140],
-"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,140,0],
-"zfinger_8php.html":[6,0,1,141],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,141,0],
+"xchan_8php.html":[6,0,1,140],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,140,0],
+"xrd_8php.html":[6,0,1,141],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,141,0],
+"xref_8php.html":[6,0,1,142],
+"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,142,0],
+"zfinger_8php.html":[6,0,1,143],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,143,0],
 "zot_8php.html":[6,0,0,83],
 "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,83,15],
 "zot_8php.html#a084c581d534e7e3b759488b46602288f":[6,0,0,83,20],
@@ -173,8 +185,8 @@ var NAVTREEINDEX9 =
 "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,83,21],
 "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,83,24],
 "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,83,26],
-"zotfeed_8php.html":[6,0,1,142],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,142,0],
-"zping_8php.html":[6,0,1,143],
-"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,143,0]
+"zotfeed_8php.html":[6,0,1,144],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,144,0],
+"zping_8php.html":[6,0,1,145],
+"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,145,0]
 };