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, 93 insertions, 93 deletions

diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index eddcedff6..532bd771e 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -150,104 +150,104 @@ var NAVTREEINDEX0 =
 "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[6,0,1,9,0],
 "blocks_8php.html#aebe88302181883d2b17d6e98a1aaebe9":[6,0,1,9,1],
 "boot_8php.html":[6,0,4],
-"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,149],
-"boot_8php.html#a0209e605028a5bb492683951ab30d49d":[6,0,4,310],
-"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,163],
-"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,268],
-"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,141],
-"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,59],
-"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,182],
-"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,50],
-"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,114],
+"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,151],
+"boot_8php.html#a0209e605028a5bb492683951ab30d49d":[6,0,4,312],
+"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,165],
+"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,270],
+"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,143],
+"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,61],
+"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,184],
+"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,52],
+"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,116],
 "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1],
-"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,224],
-"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,74],
-"boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3":[6,0,4,301],
-"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,186],
-"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,288],
-"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,284],
-"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,287],
+"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,225],
+"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,76],
+"boot_8php.html#a0afeb43da443d6ff3526ede5ecdcc3b3":[6,0,4,303],
+"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,188],
+"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,290],
+"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,286],
+"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,289],
 "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,23],
-"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,66],
+"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,68],
 "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15],
-"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,84],
-"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,43],
-"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,273],
-"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,143],
-"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,272],
-"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,88],
-"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,85],
-"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,213],
-"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,69],
-"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,162],
-"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,158],
-"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,185],
-"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,152],
-"boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71":[6,0,4,300],
-"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,307],
-"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,262],
-"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,309],
-"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,189],
-"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,83],
-"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,239],
-"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,116],
-"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,169],
-"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,233],
-"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,206],
-"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,264],
-"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,44],
+"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,86],
+"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,45],
+"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,275],
+"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,145],
+"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,274],
+"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,90],
+"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,87],
+"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,215],
+"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,71],
+"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,164],
+"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,160],
+"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,187],
+"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,154],
+"boot_8php.html#a1997c4b7d0253e036bc0fb6b20e4af71":[6,0,4,302],
+"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,309],
+"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,264],
+"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,311],
+"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,191],
+"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,85],
+"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,240],
+"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,118],
+"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,171],
+"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,234],
+"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,208],
+"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,266],
+"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,46],
 "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,22],
-"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,109],
-"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,99],
-"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,276],
-"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,209],
-"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,90],
-"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,142],
-"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,237],
-"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,117],
-"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,260],
-"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,205],
-"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,138],
-"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,75],
-"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,80],
+"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,111],
+"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,101],
+"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,278],
+"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,211],
+"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,92],
+"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,144],
+"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,238],
+"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,119],
+"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,262],
+"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,207],
+"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,140],
+"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,77],
+"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,82],
 "boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17],
-"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,244],
-"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,156],
-"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,47],
-"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,131],
-"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,171],
-"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,220],
-"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,314],
-"boot_8php.html#a37281c30bd92cecb499878d6778c570f":[6,0,4,299],
-"boot_8php.html#a37ddabc112db443b4c67fbc0f708817e":[6,0,4,103],
-"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,194],
-"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,120],
-"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,125],
-"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,313],
-"boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,191],
-"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,235],
+"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,245],
+"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,158],
+"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,49],
+"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,133],
+"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,173],
+"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,222],
+"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,316],
+"boot_8php.html#a37281c30bd92cecb499878d6778c570f":[6,0,4,301],
+"boot_8php.html#a37ddabc112db443b4c67fbc0f708817e":[6,0,4,105],
+"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,196],
+"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,122],
+"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,127],
+"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,315],
+"boot_8php.html#a3d48dffd9dc73a187263c3002cdf00c0":[6,0,4,193],
+"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,236],
 "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12],
-"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,67],
-"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,97],
-"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,57],
-"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,145],
-"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,228],
-"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,204],
-"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,96],
-"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,179],
-"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,166],
-"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,78],
-"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,172],
-"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,285],
-"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,192],
-"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,115],
-"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,254],
-"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,190],
+"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,69],
+"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,99],
+"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,59],
+"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,147],
+"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,229],
+"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,206],
+"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,98],
+"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,181],
+"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,168],
+"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,80],
+"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,174],
+"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,287],
+"boot_8php.html#a476c499e15caf75972fed134a8f23b2e":[6,0,4,42],
+"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,194],
+"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,117],
+"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,256],
+"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,192],
 "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6],
-"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,226],
-"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,63],
-"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,249],
-"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,216],
-"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501":[6,0,4,31],
-"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,170]
+"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,227],
+"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,65],
+"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,250],
+"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,218],
+"boot_8php.html#a50a6707a28c7d05d3f49eaabc7994501":[6,0,4,31]
 };