[med-svn] [gnumed-client] 02/05: New upstream version 1.6.14+dfsg

Andreas Tille tille at debian.org
Tue Sep 12 15:17:56 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository gnumed-client.

commit 479cac3896cf87521c7fd0e9dfbf76505bfd40aa
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 12 16:42:58 2017 +0200

    New upstream version 1.6.14+dfsg
---
 client/CHANGELOG                                   |  15 +
 client/business/gmDICOM.py                         |   3 +
 client/business/gmDocuments.py                     |  72 ++++-
 client/business/gmExportArea.py                    |  92 ++++--
 client/business/gmForms.py                         |   6 +-
 client/business/gmHL7.py                           |   2 +-
 client/business/gmIncomingData.py                  |   2 +-
 client/business/gmKeywordExpansion.py              |   2 +-
 client/business/gmMedication.py                    |   2 +-
 client/business/gmPerson.py                        |   6 +-
 client/business/gmProviderInbox.py                 |  20 +-
 client/doc/schema/gnumed-entire_schema.html        |   2 +-
 .../doc/user-manual/Gnumed/APIDocumentation.html   |   6 +-
 client/doc/user-manual/Gnumed/BackendI18N.html     |   4 +-
 .../user-manual/Gnumed/CardiacDeviceModule.html    |   6 +-
 client/doc/user-manual/Gnumed/ConceptAddress.html  |   4 +-
 .../user-manual/Gnumed/ConceptOrganisation.html    |   4 +-
 .../user-manual/Gnumed/DBConcurrencyHandling.html  |  12 +-
 client/doc/user-manual/Gnumed/DatabaseSchema.html  |   4 +-
 .../doc/user-manual/Gnumed/DbRevisionHandling.html |   4 +-
 client/doc/user-manual/Gnumed/DbStructure.html     |   6 +-
 .../user-manual/Gnumed/DevelopmentGuidelines.html  |   8 +-
 client/doc/user-manual/Gnumed/FaxIntegration.html  |   4 +-
 client/doc/user-manual/Gnumed/Forms.html           |  18 +-
 .../Gnumed/GmManualAccountManagement.html          |   6 +-
 .../Gnumed/GmManualAccountManagementRu.html        |   4 +-
 .../Gnumed/GmManualAppointmentHandling.html        |   4 +-
 .../Gnumed/GmManualAppointmentHandlingRu.html      |   6 +-
 .../Gnumed/GmManualBasicEmrConcept.html            |   4 +-
 .../Gnumed/GmManualBasicEmrConceptRu.html          |   4 +-
 .../Gnumed/GmManualBasicEmrStructuring.html        |   4 +-
 .../Gnumed/GmManualBasicEmrStructuringRu.html      |   6 +-
 .../Gnumed/GmManualBasicPatientHandling.html       |   4 +-
 .../Gnumed/GmManualBasicPatientHandlingRu.html     |   4 +-
 .../Gnumed/GmManualBasicProgressNotes.html         |  20 +-
 .../Gnumed/GmManualBasicProgressNotesRu.html       |  18 +-
 .../user-manual/Gnumed/GmManualBasicUsageTips.html |   4 +-
 .../Gnumed/GmManualBasicUsageTipsRu.html           |   6 +-
 .../Gnumed/GmManualClientAccessManagement.html     |   6 +-
 .../Gnumed/GmManualClientAccessManagementRu.html   |   6 +-
 .../Gnumed/GmManualClientMaintenance.html          |   4 +-
 .../Gnumed/GmManualClientMaintenanceRu.html        |   6 +-
 .../user-manual/Gnumed/GmManualConfigFiles.html    |   4 +-
 .../user-manual/Gnumed/GmManualConfigFilesRu.html  |   6 +-
 .../Gnumed/GmManualConfigPatientSearch.html        |   6 +-
 .../Gnumed/GmManualConfigPatientSearchRu.html      |   6 +-
 .../Gnumed/GmManualConfigureClientOptions.html     |  10 +-
 .../Gnumed/GmManualConfigureClientOptionsRu.html   |   6 +-
 .../Gnumed/GmManualCustomizingBackendLogin.html    |   4 +-
 .../Gnumed/GmManualCustomizingBackendLoginRu.html  |   6 +-
 .../Gnumed/GmManualCustomizingClientStartup.html   |   4 +-
 .../Gnumed/GmManualCustomizingClientStartupRu.html |   4 +-
 .../Gnumed/GmManualDatabaseBackupRestore.html      |   4 +-
 .../Gnumed/GmManualDatabaseBackupRestoreRu.html    |   4 +-
 .../Gnumed/GmManualDocManagementCfg.html           |   6 +-
 .../Gnumed/GmManualDocManagementCfgRu.html         |   6 +-
 .../Gnumed/GmManualDocumentImporter.html           |   4 +-
 .../Gnumed/GmManualDocumentImporterRu.html         |   4 +-
 .../Gnumed/GmManualDocumentManagementConcepts.html |   4 +-
 .../GmManualDocumentManagementConceptsRu.html      |   4 +-
 .../user-manual/Gnumed/GmManualDocumentViewer.html |   6 +-
 .../Gnumed/GmManualDocumentViewerRu.html           |   6 +-
 .../Gnumed/GmManualExternalPatientImport.html      |   4 +-
 .../Gnumed/GmManualExternalPatientImportRu.html    |   4 +-
 .../Gnumed/GmManualGermanKVKInterface.html         |   6 +-
 .../user-manual/Gnumed/GmManualGuiElements.html    |   4 +-
 .../user-manual/Gnumed/GmManualGuiElementsRu.html  |   4 +-
 .../user-manual/Gnumed/GmManualHooksFramework.html |   4 +-
 .../Gnumed/GmManualHooksFrameworkRu.html           |   6 +-
 .../user-manual/Gnumed/GmManualLettersForms.html   |   6 +-
 .../user-manual/Gnumed/GmManualLettersFormsRu.html |   6 +-
 .../Gnumed/GmManualManageMasterData.html           |   4 +-
 .../Gnumed/GmManualManageMasterDataRu.html         |   6 +-
 .../Gnumed/GmManualManagingAllergies.html          |   6 +-
 .../Gnumed/GmManualManagingAllergiesRu.html        |   6 +-
 .../Gnumed/GmManualManagingHospitalStays.html      |   4 +-
 .../Gnumed/GmManualManagingHospitalStaysRu.html    |   6 +-
 .../Gnumed/GmManualManagingOrgsPraxis.html         |   4 +-
 .../Gnumed/GmManualManagingProcedures.html         |   4 +-
 .../Gnumed/GmManualManagingProceduresRu.html       |   6 +-
 .../user-manual/Gnumed/GmManualManagingUsers.html  |   6 +-
 .../Gnumed/GmManualManagingUsersRu.html            |   6 +-
 .../Gnumed/GmManualPatientPhotographs.html         |   4 +-
 .../Gnumed/GmManualPatientPhotographsRu.html       |   4 +-
 .../Gnumed/GmManualPlaceholderReference.html       |   4 +-
 .../user-manual/Gnumed/GmManualReferenceData.html  |   6 +-
 .../Gnumed/GmManualReferenceDataRu.html            |   4 +-
 .../Gnumed/GmManualReportGenerator.html            |   6 +-
 .../Gnumed/GmManualReportGeneratorRu.html          |   6 +-
 .../user-manual/Gnumed/GmManualServerInstall.html  |   4 +-
 .../Gnumed/GmManualServerInstallRu.html            |   4 +-
 .../Gnumed/GmManualServerIntoProduction.html       |   4 +-
 .../Gnumed/GmManualServerIntoProductionRu.html     |   6 +-
 .../user-manual/Gnumed/GmManualServerUpgrade.html  |   4 +-
 .../Gnumed/GmManualServerUpgradeRu.html            |   4 +-
 .../user-manual/Gnumed/GmManualStartingGnumed.html |   4 +-
 .../Gnumed/GmManualStartingGnumedRu.html           |   4 +-
 .../Gnumed/GmManualSubstanceUseConcepts.html       |   4 +-
 .../Gnumed/GmManualSubstanceUseConceptsRu.html     |   4 +-
 .../Gnumed/GmManualTestResultConcepts.html         |   4 +-
 .../Gnumed/GmManualTestResultConceptsRu.html       |   4 +-
 .../Gnumed/GmManualTestResultImport.html           |   6 +-
 .../Gnumed/GmManualTestResultImportRu.html         |   4 +-
 .../Gnumed/GmManualTestResultViewer.html           |   4 +-
 .../Gnumed/GmManualTestResultViewerRu.html         |   6 +-
 .../user-manual/Gnumed/GmManualUserInterface.html  |   6 +-
 .../Gnumed/GmManualUserInterfaceRu.html            |   4 +-
 .../Gnumed/GmManualVaccinationHandling.html        |   4 +-
 .../Gnumed/GmManualVaccinationHandlingRu.html      |   4 +-
 .../Gnumed/GmManualVisualProgressNotes.html        |   4 +-
 .../Gnumed/GmManualVisualProgressNotesRu.html      |   6 +-
 .../user-manual/Gnumed/GmManualWaitingList.html    |   6 +-
 .../user-manual/Gnumed/GmManualWaitingListRu.html  |   6 +-
 .../doc/user-manual/Gnumed/GmManualXmlRpcApi.html  |   4 +-
 .../user-manual/Gnumed/GmManualXmlRpcApiRu.html    |   4 +-
 client/doc/user-manual/Gnumed/GnumedManual.html    |   4 +-
 .../doc/user-manual/Gnumed/GnumedTimeConcept.html  |   4 +-
 client/doc/user-manual/Gnumed/I18N.html            |   4 +-
 client/doc/user-manual/Gnumed/InputDevices.html    |   6 +-
 .../doc/user-manual/Gnumed/InstallerGuideHome.html |  24 +-
 client/doc/user-manual/Gnumed/LabModule.html       |   4 +-
 client/doc/user-manual/Gnumed/LegacyAppAPW.html    |   6 +-
 .../user-manual/Gnumed/LegacyAppConfiguration.html |  20 +-
 .../user-manual/Gnumed/LegacyAppDocConcept.html    |  46 +--
 .../doc/user-manual/Gnumed/LegacyAppTerminiko.html |  48 +--
 client/doc/user-manual/Gnumed/LicensingStatus.html |   6 +-
 client/doc/user-manual/Gnumed/MenuReference.html   |   4 +-
 client/doc/user-manual/Gnumed/PaperToEmr.html      |  10 +-
 client/doc/user-manual/Gnumed/ReleaseStatus.html   |   6 +-
 .../user-manual/Gnumed/ServerInstallUpgrade.html   |   6 +-
 client/doc/user-manual/Gnumed/TalkbackClient.html  |   4 +-
 .../doc/user-manual/Gnumed/UiDesignDecisions.html  |   6 +-
 client/exporters/gmPatientExporter.py              |  16 +-
 client/gnumed.py                                   |   2 +-
 client/po/ar-gnumed.mo                             | Bin 2373 -> 2332 bytes
 client/po/bg-gnumed.mo                             | Bin 1340 -> 1299 bytes
 client/po/ca-gnumed.mo                             | Bin 25469 -> 25428 bytes
 client/po/cs-gnumed.mo                             | Bin 27310 -> 27269 bytes
 client/po/da-gnumed.mo                             | Bin 3284 -> 3243 bytes
 client/po/de-gnumed.mo                             | Bin 493483 -> 493442 bytes
 client/po/el-gnumed.mo                             | Bin 108365 -> 108324 bytes
 client/po/en_AU-gnumed.mo                          | Bin 4988 -> 4947 bytes
 client/po/en_CA-gnumed.mo                          | Bin 15065 -> 15024 bytes
 client/po/es-gnumed.mo                             | Bin 514765 -> 514724 bytes
 client/po/fr-gnumed.mo                             | Bin 152053 -> 152012 bytes
 client/po/id-gnumed.mo                             | Bin 4526 -> 4485 bytes
 client/po/it-gnumed.mo                             | Bin 101242 -> 101201 bytes
 client/po/ka-gnumed.mo                             | Bin 1928 -> 1887 bytes
 client/po/nb-gnumed.mo                             | Bin 2194 -> 2153 bytes
 client/po/nl-gnumed.mo                             | Bin 141767 -> 141726 bytes
 client/po/pl-gnumed.mo                             | Bin 38003 -> 37962 bytes
 client/po/pt-gnumed.mo                             | Bin 124922 -> 124881 bytes
 client/po/pt_BR-gnumed.mo                          | Bin 149991 -> 149950 bytes
 client/po/ro-gnumed.mo                             | Bin 1311 -> 1270 bytes
 client/po/ru-gnumed.mo                             | Bin 431563 -> 431522 bytes
 client/po/ru_RU-gnumed.mo                          | Bin 451187 -> 451146 bytes
 client/po/sq-gnumed.mo                             | Bin 33489 -> 33448 bytes
 client/po/sr-gnumed.mo                             | Bin 14583 -> 14542 bytes
 client/po/sv-gnumed.mo                             | Bin 65951 -> 65910 bytes
 client/po/tr-gnumed.mo                             | Bin 1940 -> 1899 bytes
 client/po/uk-gnumed.mo                             | Bin 862 -> 821 bytes
 client/po/zh_TW-gnumed.mo                          | Bin 2740 -> 2699 bytes
 client/pycommon/gmPG2.py                           | 330 +++++++++++++++------
 client/pycommon/gmPsql.py                          |  61 ++--
 client/pycommon/x-test-default_ro.py               |  65 ++++
 client/pycommon/x-test-psy.py                      | 203 +++++++++++++
 client/wxpython/gmDataMiningWidgets.py             |   4 +-
 client/wxpython/gmDeviceWidgets.py                 |   2 +-
 client/wxpython/gmDocumentWidgets.py               | 155 ++++++----
 client/wxpython/gmEMRBrowser.py                    |   4 +-
 client/wxpython/gmExportAreaWidgets.py             |  22 +-
 client/wxpython/gmFormWidgets.py                   |   4 +-
 client/wxpython/gmGuiHelpers.py                    |  22 +-
 client/wxpython/gmGuiMain.py                       |   8 +-
 client/wxpython/gmMacro.py                         |   6 +-
 client/wxpython/gmMeasurementWidgets.py            |   2 +-
 client/wxpython/gmMedicationWidgets.py             |   6 +-
 client/wxpython/gmNarrativeWorkflows.py            |   2 +-
 client/wxpython/gmPatPicWidgets.py                 |   2 +-
 client/wxpython/gmProviderInboxWidgets.py          |  20 +-
 client/wxpython/gmVisualProgressNoteWidgets.py     |   6 +-
 181 files changed, 1244 insertions(+), 684 deletions(-)

diff --git a/client/CHANGELOG b/client/CHANGELOG
index 66b7f05..1e15d80 100644
--- a/client/CHANGELOG
+++ b/client/CHANGELOG
@@ -6,6 +6,21 @@
 # rel-1-6-patches
 ------------------------------------------------
 
+	1.6.14
+
+FIX: exception when having issues with calculating eGFR in medication plugin
+FIX: exception on disabling identity [thanks Marc]
+FIX: exception on adding archived documents to export area
+FIX: Orthanc DICOM patient ID modification
+FIX: faulty file drop target declarations
+
+IMPROVED: saving of export area items
+IMPROVED: patient display in provider inbox
+IMPROVED: copy document to export area from document plugin
+IMPROVED: Orthanc modification dialog title
+IMPROVED: imported documents deletion confirmation
+IMPROVED: patient media metadata
+
 	1.6.13
 
 FIX: editing of drug products
diff --git a/client/business/gmDICOM.py b/client/business/gmDICOM.py
index ce4c926..279df3b 100644
--- a/client/business/gmDICOM.py
+++ b/client/business/gmDICOM.py
@@ -494,6 +494,9 @@ class cOrthancServer:
 				#,u'0010,0021': praxis.name / "GNUmed vX.X.X"
 				#,u'0010,1002': series of (old) patient IDs
 			}
+			, u'Force': True
+			# "Keep" doesn't seem to do what it suggests ATM
+			#, u'Keep': True
 		}
 		o_pats = self.get_patients_by_external_id(external_id = old_patient_id)
 		all_modified = True
diff --git a/client/business/gmDocuments.py b/client/business/gmDocuments.py
index 2a8e33c..db40bc9 100644
--- a/client/business/gmDocuments.py
+++ b/client/business/gmDocuments.py
@@ -266,7 +266,7 @@ class cDocumentPart(gmBusinessDBObject.cBusinessDBObject):
 	#--------------------------------------------------------
 	# retrieve data
 	#--------------------------------------------------------
-	def export_to_file(self, aChunkSize=0, filename=None, target_mime=None, target_extension=None, ignore_conversion_problems=False, directory=None):
+	def save_to_file(self, aChunkSize=0, filename=None, target_mime=None, target_extension=None, ignore_conversion_problems=False, directory=None):
 
 		if self._payload[self._idx['size']] == 0:
 			return None
@@ -313,6 +313,7 @@ class cDocumentPart(gmBusinessDBObject.cBusinessDBObject):
 
 		_log.warning('programmed to ignore conversion problems, hoping receiver can handle [%s]', filename)
 		return filename
+
 	#--------------------------------------------------------
 	def get_reviews(self):
 		cmd = u"""
@@ -333,9 +334,11 @@ ORDER BY
 """
 		rows, idx = gmPG2.run_ro_queries(queries = [{'cmd': cmd, 'args': [self.pk_obj]}])
 		return rows
+
 	#--------------------------------------------------------
 	def get_containing_document(self):
 		return cDocument(aPK_obj = self._payload[self._idx['pk_doc']])
+
 	#--------------------------------------------------------
 	# store data
 	#--------------------------------------------------------
@@ -357,6 +360,7 @@ ORDER BY
 		# must update XMIN now ...
 		self.refetch_payload(link_obj = link_obj)
 		return True
+
 	#--------------------------------------------------------
 	def set_reviewed(self, technically_abnormal=None, clinically_relevant=None):
 		# row already there ?
@@ -467,7 +471,7 @@ insert into blobs.reviewed_doc_objs (
 	#--------------------------------------------------------
 	def display_via_mime(self, chunksize=0, block=None):
 
-		fname = self.export_to_file(aChunkSize = chunksize)
+		fname = self.save_to_file(aChunkSize = chunksize)
 		if fname is None:
 			return False, ''
 
@@ -535,26 +539,44 @@ insert into blobs.reviewed_doc_objs (
 		return txt
 
 	#--------------------------------------------------------
-	def get_useful_filename(self, patient=None, make_unique=False, directory=None):
-		patient_part = ''
+	def get_useful_filename(self, patient=None, make_unique=False, directory=None, include_gnumed_tag=True, date_before_type=False, name_first=True):
+		patient_part = u''
 		if patient is not None:
-			patient_part = '-%s-' % patient['dirname']
+			if name_first:
+				patient_part = u'%s-' % patient['dirname']
+			else:
+				patient_part = u'-%s' % patient['dirname']
 
 		# preserve original filename extension if available
 		suffix = '.dat'
 		if self._payload[self._idx['filename']] is not None:
 			tmp, suffix = os.path.splitext(self._payload[self._idx['filename']])
-			suffix = suffix.strip().replace(' ', '-')
+			suffix = suffix.strip().replace(' ', '-').lower()
 			if suffix == u'':
 				suffix = '.dat'
 
-		fname = 'gm_doc-part_%s-%s-%s-%s-' % (
-			self._payload[self._idx['seq_idx']],
-			patient_part,
-			self._payload[self._idx['l10n_type']].replace(' ', '_'),
-			gmDateTime.pydt_strftime(self._payload[self._idx['date_generated']], '%Y-%m-%d', 'utf-8', gmDateTime.acc_days)
-			#,gmTools.coalesce(self.__curr_node_data['ext_ref'], '', '-%s').replace(' ', '_')
-		)
+		if include_gnumed_tag:
+			fname_template = u'gm_doc-part_%s-%%s' % self._payload[self._idx['seq_idx']]
+		else:
+			fname_template = u'%%s-part_%s' % self._payload[self._idx['seq_idx']]
+
+		if date_before_type:
+			date_type_part = u'%s-%s' % (
+				gmDateTime.pydt_strftime(self._payload[self._idx['date_generated']], '%Y-%m-%d', 'utf-8', gmDateTime.acc_days),
+				self._payload[self._idx['l10n_type']].replace(u' ', u'_').replace(u'-', u'_'),
+			)
+		else:
+			date_type_part = u'%s-%s' % (
+				self._payload[self._idx['l10n_type']].replace(u' ', u'_').replace(u'-', u'_'),
+				gmDateTime.pydt_strftime(self._payload[self._idx['date_generated']], '%Y-%m-%d', 'utf-8', gmDateTime.acc_days)
+			)
+
+		if name_first:
+			date_type_name_part = patient_part + date_type_part
+		else:
+			date_type_name_part = date_type_part + patient_part
+
+		fname = fname_template % date_type_name_part
 
 		if make_unique:
 			fname = gmTools.get_unique_filename (
@@ -717,10 +739,10 @@ class cDocument(gmBusinessDBObject.cBusinessDBObject):
 
 		return (True, '', new_parts)
 	#--------------------------------------------------------
-	def export_parts_to_files(self, export_dir=None, chunksize=0):
+	def save_parts_to_files(self, export_dir=None, chunksize=0):
 		fnames = []
 		for part in self.parts:
-			fname = part.export_to_file(aChunkSize = chunksize)
+			fname = part.save_to_file(aChunkSize = chunksize)
 			if export_dir is not None:
 				shutil.move(fname, export_dir)
 				fname = os.path.join(export_dir, os.path.split(fname)[1])
@@ -1088,12 +1110,30 @@ if __name__ == '__main__':
 			print doc.format()
 		#pprint(gmBusinessDBObject.jsonclasshintify(docs))
 	#--------------------------------------------------------
+	def test_get_useful_filename():
+		pk = 12
+		from Gnumed.business.gmPerson import cPatient
+		pat = cPatient(pk)
+		doc_folder = cDocumentFolder(aPKey = pk)
+		for doc in doc_folder.documents:
+			for part in doc.parts:
+				print part.get_useful_filename (
+					patient = pat,
+					make_unique = True,
+					directory = None,
+					include_gnumed_tag = False,
+					date_before_type = True,
+					name_first = False
+				)
+
+	#--------------------------------------------------------
 	from Gnumed.pycommon import gmI18N
 	gmI18N.activate_locale()
 	gmI18N.install_domain()
 
 	#test_doc_types()
 	#test_adding_doc_part()
-	test_get_documents()
+	#test_get_documents()
+	test_get_useful_filename()
 
 #	print get_ext_ref()
diff --git a/client/business/gmExportArea.py b/client/business/gmExportArea.py
index ecd01f7..b4ee10b 100644
--- a/client/business/gmExportArea.py
+++ b/client/business/gmExportArea.py
@@ -102,17 +102,29 @@ class cExportItem(gmBusinessDBObject.cBusinessDBObject):
 		# must update XMIN now ...
 		self.refetch_payload()
 		return True
+
 	#--------------------------------------------------------
-	def export_to_file(self, aChunkSize=0, filename=None, directory=None):
+	def save_to_file(self, aChunkSize=0, filename=None, directory=None):
 
+		# data linked from archive
 		if self._payload[self._idx['pk_doc_obj']] is not None:
-			return self.document_part.export_to_file (
+			part = self.document_part
+			if filename is None:
+				filename = part.get_useful_filename (
+					make_unique = False,
+					directory = directory,
+					include_gnumed_tag = False,
+					date_before_type = True,
+					name_first = False
+				)
+			return part.save_to_file (
 				aChunkSize = aChunkSize,
 				filename = filename,
-				ignore_conversion_problems = True,
-				directory = directory
+				ignore_conversion_problems = True
+				#, directory = directory
 			)
 
+		# data in export area table
 		if filename is None:
 			filename = self.get_useful_filename(directory = directory)
 
@@ -130,13 +142,14 @@ class cExportItem(gmBusinessDBObject.cBusinessDBObject):
 			return None
 
 		return filename
+
 	#--------------------------------------------------------
 	def display_via_mime(self, chunksize=0, block=None):
 
 		if self._payload[self._idx['pk_doc_obj']] is not None:
 			return self.document_part.display_via_mime(chunksize = chunksize, block = block)
 
-		fname = self.export_to_file(aChunkSize = chunksize)
+		fname = self.save_to_file(aChunkSize = chunksize)
 		if fname is None:
 			return False, ''
 
@@ -145,6 +158,7 @@ class cExportItem(gmBusinessDBObject.cBusinessDBObject):
 			return False, msg
 
 		return True, ''
+
 	#--------------------------------------------------------
 	def get_useful_filename(self, patient=None, directory=None):
 		patient_part = ''
@@ -155,7 +169,7 @@ class cExportItem(gmBusinessDBObject.cBusinessDBObject):
 		suffix = '.dat'
 		if self._payload[self._idx['filename']] is not None:
 			tmp, suffix = os.path.splitext(self._payload[self._idx['filename']])
-			suffix = suffix.strip().replace(' ', '-')
+			suffix = suffix.strip().replace(' ', '-').lower()
 			if suffix == u'':
 				suffix = '.dat'
 
@@ -166,6 +180,7 @@ class cExportItem(gmBusinessDBObject.cBusinessDBObject):
 		)
 
 		return os.path.join(directory, fname)
+
 	#--------------------------------------------------------
 	# properties
 	#--------------------------------------------------------
@@ -313,22 +328,22 @@ _html_end = u"""
 
 
 _autorun_inf = (
-u'[AutoRun]\r\n'						# needs \r\n for Windows
-u'label=%s\r\n'							# patient name/DOB
-u'shellexecute=index.html\r\n'
-u'action=%s\r\n'						# % _('Browse patient data')
-u'\r\n'
-u'[Content]\r\n'
-u'PictureFiles=yes\r\n'
-u'VideoFiles=yes\r\n'
-u'MusicFiles=no\r\n'
-u'\r\n'
-u'[IgnoreContentPaths]\r\n'
-u'\documents\r\n'
-u'\r\n'
-u'[unused]\r\n'
-u'open=requires explicit executable\r\n'
-u'icon=use standard icon for storage unit\r\n'
+	u'[AutoRun]\r\n'						# needs \r\n for Windows
+	u'label=%s\r\n'							# patient name/DOB
+	u'shellexecute=index.html\r\n'
+	u'action=%s\r\n'						# % _('Browse patient data')
+	u'\r\n'
+	u'[Content]\r\n'
+	u'PictureFiles=yes\r\n'
+	u'VideoFiles=yes\r\n'
+	u'MusicFiles=no\r\n'
+	u'\r\n'
+	u'[IgnoreContentPaths]\r\n'
+	u'\documents\r\n'
+	u'\r\n'
+	u'[unused]\r\n'
+	u'open=requires explicit executable\r\n'
+	u'icon=use standard icon for storage unit\r\n'
 )
 
 
@@ -420,6 +435,7 @@ class cExportArea(object):
 
 		delete_export_item(pk_export_item = item['pk_export_item'])
 		return None
+
 	#--------------------------------------------------------
 	def add_files(self, filenames=None, hint=None):
 		all_ok = True
@@ -427,6 +443,7 @@ class cExportArea(object):
 			all_ok = all_ok and (self.add_file(filename = fname, hint = hint) is not None)
 
 		return all_ok
+
 	#--------------------------------------------------------
 	def add_documents(self, documents=None):
 		for doc in documents:
@@ -440,7 +457,7 @@ class cExportArea(object):
 					continue
 				f_ext = u''
 				if obj['filename'] is not None:
-					f_ext = os.path.splitext(ob['filename'])[1].strip('.').strip()
+					f_ext = os.path.splitext(obj['filename'])[1].strip('.').strip()
 				if f_ext != u'':
 					f_ext = u' .' + f_ext.upper()
 				obj_tag = _(u'part %s (%s%s)%s') % (
@@ -460,6 +477,7 @@ class cExportArea(object):
 		args = {'pk_obj': pk_part}
 		rows, idx = gmPG2.run_ro_queries(queries = [{'cmd': cmd, 'args': args}], get_col_idx = False)
 		return rows[0][0]
+
 	#--------------------------------------------------------
 	def md5_exists(self, md5=None, include_document_parts=False):
 		where_parts = [
@@ -518,7 +536,7 @@ class cExportArea(object):
 
 		mugshot = pat.document_folder.latest_mugshot
 		if mugshot is not None:
-			_html_start_data['mugshot_url'] = mugshot.export_to_file(directory = doc_dir)
+			_html_start_data['mugshot_url'] = mugshot.save_to_file(directory = doc_dir)
 			_html_start_data['mugshot_alt'] =_('patient photograph from %s') % gmDateTime.pydt_strftime(mugshot['date_generated'], '%B %Y')
 			_html_start_data['mugshot_title'] = gmDateTime.pydt_strftime(mugshot['date_generated'], '%B %Y')
 
@@ -530,9 +548,9 @@ class cExportArea(object):
 		if u'DICOMDIR' in existing_files:
 			_html_start_data[u'browse_dicomdir'] = u'	<li><a href="./DICOMDIR">browse DICOMDIR</a></li>'
 		idx_file.write(_html_start % _html_start_data)
-		# middle
+		# middle (side effect ! -> exports items into files ...)
 		for item in items:
-			item_path = item.export_to_file(directory = doc_dir)
+			item_path = item.save_to_file(directory = doc_dir)
 			item_fname = os.path.split(item_path)[1]
 			idx_file.write(_html_list_item % (
 				item_fname,
@@ -567,13 +585,26 @@ class cExportArea(object):
 		idx_file.write(_html_end % _html_end_data)
 		idx_file.close()
 
+		# start.html (just a copy of index.html, really ;-)
+		start_fname = os.path.join(base_dir, u'start.html')
+		try:
+			shutil.copy2(idx_fname, start_fname)
+		except Exception:
+			_log.exception('cannot copy %s to %s', idx_fname, start_fname)
+
 		# autorun.inf
+		name = pat.active_name
+		last = name['lastnames'][:14]
+		first = name['firstnames'][:min(14, 18 - len(last))]
+		label = ((u'%s%s%s' % (
+			u'%s,%s' % (last, first),
+			gmTools.coalesce(pat['gender'], u'', u' (%s)'),
+			pat.get_formatted_dob(format = ' %Y%m%d', none_string = u'', honor_estimation = False)
+		)).strip())[:32]		# max 32 chars, supposedly ASCII, but LATIN1 works pretty well
+		action = _('Browse patient data')
 		autorun_fname = os.path.join(base_dir, u'autorun.inf')
 		autorun_file = io.open(autorun_fname, mode = u'wt', encoding = u'utf8')
-		autorun_file.write(_autorun_inf % (
-			(pat.get_description_gender(with_nickname = False) + u', ' + _(u'born') + u' ' + pat.get_formatted_dob('%Y %B %d')).strip(),
-			_('Browse patient data')
-		))
+		autorun_file.write(_autorun_inf % (label, action))
 		autorun_file.close()
 
 		# cd.inf
@@ -608,6 +639,7 @@ class cExportArea(object):
 		shutil.move(prax.vcf, os.path.join(base_dir, u'praxis.vcf'))
 
 		return base_dir
+
 	#--------------------------------------------------------
 	# properties
 	#--------------------------------------------------------
diff --git a/client/business/gmForms.py b/client/business/gmForms.py
index 7edd64f..0c26c45 100644
--- a/client/business/gmForms.py
+++ b/client/business/gmForms.py
@@ -193,7 +193,7 @@ class cFormTemplate(gmBusinessDBObject.cBusinessDBObject):
 
 	template_data = property(_get_template_data, lambda x:x)
 	#--------------------------------------------------------
-	def export_to_file(self, filename=None, chunksize=0):
+	def save_to_file(self, filename=None, chunksize=0):
 		"""Export form template from database into file."""
 
 		if filename is None:
@@ -240,7 +240,7 @@ class cFormTemplate(gmBusinessDBObject.cBusinessDBObject):
 		self.refetch_payload()
 	#--------------------------------------------------------
 	def instantiate(self):
-		fname = self.export_to_file()
+		fname = self.save_to_file()
 		engine = form_engines[self._payload[self._idx['engine']]]
 		form = engine(template_file = fname)
 		form.template = self
@@ -2148,7 +2148,7 @@ if __name__ == '__main__':
 	def test_cFormTemplate():
 		template = cFormTemplate(aPK_obj = sys.argv[2])
 		print template
-		print template.export_to_file()
+		print template.save_to_file()
 	#--------------------------------------------------------
 	def set_template_from_file():
 		template = cFormTemplate(aPK_obj = sys.argv[2])
diff --git a/client/business/gmHL7.py b/client/business/gmHL7.py
index 784c7a8..e3adab0 100644
--- a/client/business/gmHL7.py
+++ b/client/business/gmHL7.py
@@ -493,7 +493,7 @@ def process_staged_single_PID_hl7_file(staged_item):
 
 	_log.debug('reference ID of staged HL7 data: %s', staged_item['external_data_id'])
 
-	filename = staged_item.export_to_file()
+	filename = staged_item.save_to_file()
 	_log.debug('unstaged HL7 data into: %s', filename)
 
 	if staged_item['pk_identity_disambiguated'] is None:
diff --git a/client/business/gmIncomingData.py b/client/business/gmIncomingData.py
index 37a1c64..2d2ba04 100644
--- a/client/business/gmIncomingData.py
+++ b/client/business/gmIncomingData.py
@@ -111,7 +111,7 @@ class cIncomingData(gmBusinessDBObject.cBusinessDBObject):
 		return True
 
 	#--------------------------------------------------------
-	def export_to_file(self, aChunkSize=0, filename=None):
+	def save_to_file(self, aChunkSize=0, filename=None):
 
 		if self._payload[self._idx['data_size']] == 0:
 			return None
diff --git a/client/business/gmKeywordExpansion.py b/client/business/gmKeywordExpansion.py
index e6350ef..9fafaf5 100644
--- a/client/business/gmKeywordExpansion.py
+++ b/client/business/gmKeywordExpansion.py
@@ -60,7 +60,7 @@ class cKeywordExpansion(gmBusinessDBObject.cBusinessDBObject):
 	]
 
 	#--------------------------------------------------------
-	def export_to_file(self, aChunkSize=0, target_mime=None, target_extension=None, ignore_conversion_problems=False):
+	def save_to_file(self, aChunkSize=0, target_mime=None, target_extension=None, ignore_conversion_problems=False):
 
 		if self._payload[self._idx['is_textual']]:
 			return None
diff --git a/client/business/gmMedication.py b/client/business/gmMedication.py
index b15a02c..33a2c55 100644
--- a/client/business/gmMedication.py
+++ b/client/business/gmMedication.py
@@ -442,7 +442,7 @@ class cFreeDiamsInterface(cDrugDataSourceInterface):
 
 		for part in prescription.parts:
 			if part['filename'] == u'freediams-prescription.xml':
-				if part.export_to_file(filename = self.__fd2gm_filename) is not None:
+				if part.save_to_file(filename = self.__fd2gm_filename) is not None:
 					return True
 
 		_log.error('cannot export latest FreeDiams prescription to XML file')
diff --git a/client/business/gmPerson.py b/client/business/gmPerson.py
index f3f9c39..2bd1dcd 100644
--- a/client/business/gmPerson.py
+++ b/client/business/gmPerson.py
@@ -2352,10 +2352,8 @@ INSERT INTO dem.names (
 def disable_identity(pk_identity):
 	_log.info('disabling identity [%s]', pk_identity)
 	cmd = u"UPDATE dem.identity SET deleted = true WHERE pk = %(pk)s"
-	args = {'pk': identity['pk_identity']}
-	gmPG2.run_rw_queries(queries = [
-		{'cmd': cmd, 'args': args}
-	])
+	args = {'pk': pk_identity}
+	gmPG2.run_rw_queries(queries = [{'cmd': cmd, 'args': args}])
 	return True
 
 #============================================================
diff --git a/client/business/gmProviderInbox.py b/client/business/gmProviderInbox.py
index aedd4fc..45d5e0f 100644
--- a/client/business/gmProviderInbox.py
+++ b/client/business/gmProviderInbox.py
@@ -26,7 +26,11 @@ _log = logging.getLogger('gm.inbox')
 #============================================================
 # provider message inbox
 #------------------------------------------------------------
-_SQL_get_inbox_messages = u"SELECT * FROM dem.v_message_inbox WHERE %s"
+_SQL_get_inbox_messages = u"""
+SELECT * FROM
+	dem.v_message_inbox d_vi
+		LEFT OUTER JOIN dem.v_persons d_vp ON (d_vi.pk_patient = d_vp.pk_identity)
+WHERE %s"""
 
 class cInboxMessage(gmBusinessDBObject.cBusinessDBObject):
 
@@ -92,12 +96,14 @@ class cInboxMessage(gmBusinessDBObject.cBusinessDBObject):
 			gmTools.u_right_double_angle_quote
 		)
 
-		if with_patient:
-			tt += gmTools.coalesce (
-				self._payload[self._idx['pk_patient']],
-				u'',
-				u'%s\n\n' % _('Patient #%s')
-			)
+		if with_patient and (self._payload[self._idx['pk_patient']] is not None):
+			tt += _(u'Patient: %s, %s%s %s   #%s\n' % (
+				self._payload[self._idx['lastnames']],
+				self._payload[self._idx['firstnames']],
+				gmTools.coalesce(self._payload[self._idx['l10n_gender']], u'', u' (%s)'),
+				gmDateTime.pydt_strftime(self._payload[self._idx['dob_only']], u'%Y %b %d', none_str = u''),
+				self._payload[self._idx['pk_patient']]
+			))
 
 		if self._payload[self._idx['due_date']] is not None:
 			if self._payload[self._idx['is_overdue']]:
diff --git a/client/doc/schema/gnumed-entire_schema.html b/client/doc/schema/gnumed-entire_schema.html
index 581eaa2..6a174d8 100644
--- a/client/doc/schema/gnumed-entire_schema.html
+++ b/client/doc/schema/gnumed-entire_schema.html
@@ -112,7 +112,7 @@
   <body>
 
     <!-- Primary Index -->
-	<p><br><br>Dumped on 2017-05-14</p>
+	<p><br><br>Dumped on 2017-08-31</p>
 <h1><a name="index">Index of database - gnumed_v21</a></h1>
 <ul>
     
diff --git a/client/doc/user-manual/Gnumed/APIDocumentation.html b/client/doc/user-manual/Gnumed/APIDocumentation.html
index bef84fc..b271242 100644
--- a/client/doc/user-manual/Gnumed/APIDocumentation.html
+++ b/client/doc/user-manual/Gnumed/APIDocumentation.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/APIDocumentation?t=1448132839" type="application/x-wiki" title="edit APIDocumentation" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/APIDocumentation?t=1504184938" type="application/x-wiki" title="edit APIDocumentation" />
 	<meta name="description" content="APIDocumentation" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="APIDocumentation" /> <!-- TOPIC -->
@@ -42,11 +42,11 @@ pre {
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 <script type="text/javascript" src="../rsrc/System/JavascriptFiles/foswikiString.js"></script><!--JavascriptFiles/foswikiString-->
 <script type="text/javascript" src="../rsrc/System/JavascriptFiles/foswikiPref.js"></script><!--JavascriptFiles/foswikiPref-->
 <script type="text/javascript" src="../rsrc/System/JavascriptFiles/foswikiForm.js"></script><!--JavascriptFiles/foswikiForm-->
 <script type="text/javascript" src="../rsrc/System/PatternSkin/pattern.js"></script><!--PatternSkin/pattern-->
-<script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
 <a name="PageTop"></a> 
diff --git a/client/doc/user-manual/Gnumed/BackendI18N.html b/client/doc/user-manual/Gnumed/BackendI18N.html
index 544bdb4..1347c79 100644
--- a/client/doc/user-manual/Gnumed/BackendI18N.html
+++ b/client/doc/user-manual/Gnumed/BackendI18N.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/BackendI18N?t=1448132839" type="application/x-wiki" title="edit BackendI18N" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/BackendI18N?t=1504184938" type="application/x-wiki" title="edit BackendI18N" />
 	<meta name="description" content="BackendI18N" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="BackendI18N" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/CardiacDeviceModule.html b/client/doc/user-manual/Gnumed/CardiacDeviceModule.html
index a97f887..abb2855 100644
--- a/client/doc/user-manual/Gnumed/CardiacDeviceModule.html
+++ b/client/doc/user-manual/Gnumed/CardiacDeviceModule.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/CardiacDeviceModule?t=1448132840" type="application/x-wiki" title="edit CardiacDeviceModule" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/CardiacDeviceModule?t=1504184938" type="application/x-wiki" title="edit CardiacDeviceModule" />
 	<meta name="description" content="CardiacDeviceModule" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="CardiacDeviceModule" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/ConceptAddress.html b/client/doc/user-manual/Gnumed/ConceptAddress.html
index 13a70ea..2e96e4d 100644
--- a/client/doc/user-manual/Gnumed/ConceptAddress.html
+++ b/client/doc/user-manual/Gnumed/ConceptAddress.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ConceptAddress?t=1448132840" type="application/x-wiki" title="edit ConceptAddress" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ConceptAddress?t=1504184938" type="application/x-wiki" title="edit ConceptAddress" />
 	<meta name="description" content="ConceptAddress" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="ConceptAddress" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/ConceptOrganisation.html b/client/doc/user-manual/Gnumed/ConceptOrganisation.html
index 9999ebb..844fcc2 100644
--- a/client/doc/user-manual/Gnumed/ConceptOrganisation.html
+++ b/client/doc/user-manual/Gnumed/ConceptOrganisation.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ConceptOrganisation?t=1448132840" type="application/x-wiki" title="edit ConceptOrganisation" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ConceptOrganisation?t=1504184938" type="application/x-wiki" title="edit ConceptOrganisation" />
 	<meta name="description" content="ConceptOrganisation" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="ConceptOrganisation" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/DBConcurrencyHandling.html b/client/doc/user-manual/Gnumed/DBConcurrencyHandling.html
index 2cb8fdf..b4e0af0 100644
--- a/client/doc/user-manual/Gnumed/DBConcurrencyHandling.html
+++ b/client/doc/user-manual/Gnumed/DBConcurrencyHandling.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DBConcurrencyHandling?t=1448132840" type="application/x-wiki" title="edit DBConcurrencyHandling" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DBConcurrencyHandling?t=1504184938" type="application/x-wiki" title="edit DBConcurrencyHandling" />
 	<meta name="description" content="DBConcurrencyHandling" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -42,7 +42,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="DBConcurrencyHandling" /> <!-- TOPIC -->
@@ -149,8 +149,8 @@ This occurs very rarely and happens in the following sequence of events (note ho
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th align="center" class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=1;up=0#sorted_table" rel="nofollow" title="Sort by this column">transaction A</a> </th>
-			<th align="center" class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=1;up=0#sorted_table" rel="nofollow" title="Sort by this column">transaction B</a> </th>
+			<th align="center" class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=1;up=0#sorted_table" rel="nofollow" title="Sort by this column">transaction A</a> </th>
+			<th align="center" class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=1;up=0#sorted_table" rel="nofollow" title="Sort by this column">transaction B</a> </th>
 		</tr>
 	</thead>
 	<tbody>
@@ -189,8 +189,8 @@ This is way more likely to occur than with overlapping transactions as described
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=2;up=0#sorted_table" rel="nofollow" title="Sort by this column">nurse</a> </th>
-			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=2;up=0#sorted_table" rel="nofollow" title="Sort by this column">doctor</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=2;up=0#sorted_table" rel="nofollow" title="Sort by this column">nurse</a> </th>
+			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=2;up=0#sorted_table" rel="nofollow" title="Sort by this column">doctor</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/DatabaseSchema.html b/client/doc/user-manual/Gnumed/DatabaseSchema.html
index d132ac8..e403a76 100644
--- a/client/doc/user-manual/Gnumed/DatabaseSchema.html
+++ b/client/doc/user-manual/Gnumed/DatabaseSchema.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DatabaseSchema?t=1448132840" type="application/x-wiki" title="edit DatabaseSchema" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DatabaseSchema?t=1504184938" type="application/x-wiki" title="edit DatabaseSchema" />
 	<meta name="description" content="DatabaseSchema" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="DatabaseSchema" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/DbRevisionHandling.html b/client/doc/user-manual/Gnumed/DbRevisionHandling.html
index 95a5b9a..4698b23 100644
--- a/client/doc/user-manual/Gnumed/DbRevisionHandling.html
+++ b/client/doc/user-manual/Gnumed/DbRevisionHandling.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DbRevisionHandling?t=1448132840" type="application/x-wiki" title="edit DbRevisionHandling" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DbRevisionHandling?t=1504184938" type="application/x-wiki" title="edit DbRevisionHandling" />
 	<meta name="description" content="DbRevisionHandling" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="DbRevisionHandling" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/DbStructure.html b/client/doc/user-manual/Gnumed/DbStructure.html
index eadd975..5f27d9d 100644
--- a/client/doc/user-manual/Gnumed/DbStructure.html
+++ b/client/doc/user-manual/Gnumed/DbStructure.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DbStructure?t=1448132840" type="application/x-wiki" title="edit DbStructure" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DbStructure?t=1504184938" type="application/x-wiki" title="edit DbStructure" />
 	<meta name="description" content="DbStructure" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="DbStructure" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/DevelopmentGuidelines.html b/client/doc/user-manual/Gnumed/DevelopmentGuidelines.html
index 3fa502a..739b6a7 100644
--- a/client/doc/user-manual/Gnumed/DevelopmentGuidelines.html
+++ b/client/doc/user-manual/Gnumed/DevelopmentGuidelines.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DevelopmentGuidelines?t=1448132840" type="application/x-wiki" title="edit DevelopmentGuidelines" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/DevelopmentGuidelines?t=1504184938" type="application/x-wiki" title="edit DevelopmentGuidelines" />
 	<meta name="description" content="DevelopmentGuidelines" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="DevelopmentGuidelines" /> <!-- TOPIC -->
@@ -112,8 +112,8 @@ pre {
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">area</a> </th>
-			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">coordinators</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">area</a> </th>
+			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">coordinators</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/FaxIntegration.html b/client/doc/user-manual/Gnumed/FaxIntegration.html
index b2c7b11..d87573d 100644
--- a/client/doc/user-manual/Gnumed/FaxIntegration.html
+++ b/client/doc/user-manual/Gnumed/FaxIntegration.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/FaxIntegration?t=1448132840" type="application/x-wiki" title="edit FaxIntegration" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/FaxIntegration?t=1504184938" type="application/x-wiki" title="edit FaxIntegration" />
 	<meta name="description" content="FaxIntegration" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="FaxIntegration" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/Forms.html b/client/doc/user-manual/Gnumed/Forms.html
index 0dad4b2..a4744a6 100644
--- a/client/doc/user-manual/Gnumed/Forms.html
+++ b/client/doc/user-manual/Gnumed/Forms.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/Forms?t=1448132840" type="application/x-wiki" title="edit Forms" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/Forms?t=1504184938" type="application/x-wiki" title="edit Forms" />
 	<meta name="description" content="Forms" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="Forms" /> <!-- TOPIC -->
@@ -111,8 +111,8 @@ To gave some examples, a referral form might use these variables:
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=4;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
-			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=4;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=4;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
+			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=4;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
 		</tr>
 	</thead>
 	<tbody>
@@ -139,8 +139,8 @@ For scripts (AU-style):
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=5;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
-			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=5;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=5;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
+			<th class="foswikiTableCol1 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=5;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
 		</tr>
 	</thead>
 	<tbody>
@@ -165,9 +165,9 @@ For work certificates:
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
-			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">comment</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">variable</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">type</a> </th>
+			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=6;up=0#sorted_table" rel="nofollow" title="Sort by this column">comment</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/GmManualAccountManagement.html b/client/doc/user-manual/Gnumed/GmManualAccountManagement.html
index 0de29a1..0de0ab7 100644
--- a/client/doc/user-manual/Gnumed/GmManualAccountManagement.html
+++ b/client/doc/user-manual/Gnumed/GmManualAccountManagement.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAccountManagement?t=1448132840" type="application/x-wiki" title="edit GmManualAccountManagement" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAccountManagement?t=1504184938" type="application/x-wiki" title="edit GmManualAccountManagement" />
 	<meta name="description" content="GmManualAccountManagement" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualAccountManagement" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualAccountManagementRu.html b/client/doc/user-manual/Gnumed/GmManualAccountManagementRu.html
index 1fa1089..617efea 100644
--- a/client/doc/user-manual/Gnumed/GmManualAccountManagementRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualAccountManagementRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAccountManagementRu?t=1448132840" type="application/x-wiki" title="edit GmManualAccountManagementRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAccountManagementRu?t=1504184938" type="application/x-wiki" title="edit GmManualAccountManagementRu" />
 	<meta name="description" content="GmManualAccountManagementRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualAccountManagementRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualAppointmentHandling.html b/client/doc/user-manual/Gnumed/GmManualAppointmentHandling.html
index 87503e5..229dbea 100644
--- a/client/doc/user-manual/Gnumed/GmManualAppointmentHandling.html
+++ b/client/doc/user-manual/Gnumed/GmManualAppointmentHandling.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAppointmentHandling?t=1448132840" type="application/x-wiki" title="edit GmManualAppointmentHandling" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAppointmentHandling?t=1504184938" type="application/x-wiki" title="edit GmManualAppointmentHandling" />
 	<meta name="description" content="GmManualAppointmentHandling" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualAppointmentHandling" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualAppointmentHandlingRu.html b/client/doc/user-manual/Gnumed/GmManualAppointmentHandlingRu.html
index 78ffbf6..a4a6f1b 100644
--- a/client/doc/user-manual/Gnumed/GmManualAppointmentHandlingRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualAppointmentHandlingRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAppointmentHandlingRu?t=1448132840" type="application/x-wiki" title="edit GmManualAppointmentHandlingRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualAppointmentHandlingRu?t=1504184938" type="application/x-wiki" title="edit GmManualAppointmentHandlingRu" />
 	<meta name="description" content="GmManualAppointmentHandlingRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualAppointmentHandlingRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicEmrConcept.html b/client/doc/user-manual/Gnumed/GmManualBasicEmrConcept.html
index 5883087..b8af91f 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicEmrConcept.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicEmrConcept.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrConcept?t=1448132840" type="application/x-wiki" title="edit GmManualBasicEmrConcept" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrConcept?t=1504184938" type="application/x-wiki" title="edit GmManualBasicEmrConcept" />
 	<meta name="description" content="GmManualBasicEmrConcept" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicEmrConcept" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicEmrConceptRu.html b/client/doc/user-manual/Gnumed/GmManualBasicEmrConceptRu.html
index 22eab93..35aba5d 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicEmrConceptRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicEmrConceptRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrConceptRu?t=1448132840" type="application/x-wiki" title="edit GmManualBasicEmrConceptRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrConceptRu?t=1504184938" type="application/x-wiki" title="edit GmManualBasicEmrConceptRu" />
 	<meta name="description" content="GmManualBasicEmrConceptRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicEmrConceptRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuring.html b/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuring.html
index 43b2b98..5b7b13e 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuring.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuring.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrStructuring?t=1448132841" type="application/x-wiki" title="edit GmManualBasicEmrStructuring" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrStructuring?t=1504184939" type="application/x-wiki" title="edit GmManualBasicEmrStructuring" />
 	<meta name="description" content="GmManualBasicEmrStructuring" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicEmrStructuring" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuringRu.html b/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuringRu.html
index 25a9a60..a971145 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuringRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicEmrStructuringRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrStructuringRu?t=1448132841" type="application/x-wiki" title="edit GmManualBasicEmrStructuringRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicEmrStructuringRu?t=1504184939" type="application/x-wiki" title="edit GmManualBasicEmrStructuringRu" />
 	<meta name="description" content="GmManualBasicEmrStructuringRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicEmrStructuringRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicPatientHandling.html b/client/doc/user-manual/Gnumed/GmManualBasicPatientHandling.html
index b2cd8fe..1f7f98b 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicPatientHandling.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicPatientHandling.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicPatientHandling?t=1448132841" type="application/x-wiki" title="edit GmManualBasicPatientHandling" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicPatientHandling?t=1504184939" type="application/x-wiki" title="edit GmManualBasicPatientHandling" />
 	<meta name="description" content="GmManualBasicPatientHandling" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicPatientHandling" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicPatientHandlingRu.html b/client/doc/user-manual/Gnumed/GmManualBasicPatientHandlingRu.html
index 6f16fb4..ff14286 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicPatientHandlingRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicPatientHandlingRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicPatientHandlingRu?t=1448132841" type="application/x-wiki" title="edit GmManualBasicPatientHandlingRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicPatientHandlingRu?t=1504184939" type="application/x-wiki" title="edit GmManualBasicPatientHandlingRu" />
 	<meta name="description" content="GmManualBasicPatientHandlingRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicPatientHandlingRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicProgressNotes.html b/client/doc/user-manual/Gnumed/GmManualBasicProgressNotes.html
index e5ec95a..c76cce1 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicProgressNotes.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicProgressNotes.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicProgressNotes?t=1448132841" type="application/x-wiki" title="edit GmManualBasicProgressNotes" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicProgressNotes?t=1504184939" type="application/x-wiki" title="edit GmManualBasicProgressNotes" />
 	<meta name="description" content="GmManualBasicProgressNotes" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:08" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicProgressNotes" /> <!-- TOPIC -->
@@ -57,8 +57,8 @@ pre {
 .foswikiTable#tablePublishManual7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
 </style><!--TABLEPLUGIN_specific: requires= missing ids: TABLEPLUGIN_default-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
@@ -196,13 +196,13 @@ One or more will be built up over time... see <a href="ProgressNoteExamples.html
 <table border="1" class="foswikiTable" id="tablePublishManual7" rules="none" summary="Topic-Anh�nge"><caption>Topic-Anh�nge</caption>
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
-			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
-			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=4;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
-			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=5;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
-			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=6;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
+			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
+			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=4;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
+			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=5;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
+			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=6;table=7;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicProgressNotesRu.html b/client/doc/user-manual/Gnumed/GmManualBasicProgressNotesRu.html
index 9138117..d87b041 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicProgressNotesRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicProgressNotesRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicProgressNotesRu?t=1448132841" type="application/x-wiki" title="edit GmManualBasicProgressNotesRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicProgressNotesRu?t=1504184939" type="application/x-wiki" title="edit GmManualBasicProgressNotesRu" />
 	<meta name="description" content="GmManualBasicProgressNotesRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicProgressNotesRu" /> <!-- TOPIC -->
@@ -213,13 +213,13 @@ GNUmed позволяет о&#
 <table border="1" class="foswikiTable" id="tablePublishManual8" rules="none" summary="Topic-Anh�nge"><caption>Topic-Anh�nge</caption>
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
-			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
-			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=4;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
-			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=5;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
-			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=6;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
+			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
+			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=4;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
+			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=5;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
+			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=6;table=8;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicUsageTips.html b/client/doc/user-manual/Gnumed/GmManualBasicUsageTips.html
index 10d8488..dd38dae 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicUsageTips.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicUsageTips.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicUsageTips?t=1448132841" type="application/x-wiki" title="edit GmManualBasicUsageTips" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicUsageTips?t=1504184940" type="application/x-wiki" title="edit GmManualBasicUsageTips" />
 	<meta name="description" content="GmManualBasicUsageTips" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicUsageTips" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualBasicUsageTipsRu.html b/client/doc/user-manual/Gnumed/GmManualBasicUsageTipsRu.html
index 10eab4e..43608be 100644
--- a/client/doc/user-manual/Gnumed/GmManualBasicUsageTipsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualBasicUsageTipsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicUsageTipsRu?t=1448132841" type="application/x-wiki" title="edit GmManualBasicUsageTipsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualBasicUsageTipsRu?t=1504184940" type="application/x-wiki" title="edit GmManualBasicUsageTipsRu" />
 	<meta name="description" content="GmManualBasicUsageTipsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualBasicUsageTipsRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualClientAccessManagement.html b/client/doc/user-manual/Gnumed/GmManualClientAccessManagement.html
index bf47093..caf8d18 100644
--- a/client/doc/user-manual/Gnumed/GmManualClientAccessManagement.html
+++ b/client/doc/user-manual/Gnumed/GmManualClientAccessManagement.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientAccessManagement?t=1448132841" type="application/x-wiki" title="edit GmManualClientAccessManagement" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientAccessManagement?t=1504184940" type="application/x-wiki" title="edit GmManualClientAccessManagement" />
 	<meta name="description" content="GmManualClientAccessManagement" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualClientAccessManagement" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualClientAccessManagementRu.html b/client/doc/user-manual/Gnumed/GmManualClientAccessManagementRu.html
index bf24e36..b3ee92b 100644
--- a/client/doc/user-manual/Gnumed/GmManualClientAccessManagementRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualClientAccessManagementRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientAccessManagementRu?t=1448132841" type="application/x-wiki" title="edit GmManualClientAccessManagementRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientAccessManagementRu?t=1504184940" type="application/x-wiki" title="edit GmManualClientAccessManagementRu" />
 	<meta name="description" content="GmManualClientAccessManagementRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualClientAccessManagementRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualClientMaintenance.html b/client/doc/user-manual/Gnumed/GmManualClientMaintenance.html
index d41d644..ec0ca92 100644
--- a/client/doc/user-manual/Gnumed/GmManualClientMaintenance.html
+++ b/client/doc/user-manual/Gnumed/GmManualClientMaintenance.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientMaintenance?t=1448132841" type="application/x-wiki" title="edit GmManualClientMaintenance" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientMaintenance?t=1504184940" type="application/x-wiki" title="edit GmManualClientMaintenance" />
 	<meta name="description" content="GmManualClientMaintenance" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualClientMaintenance" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualClientMaintenanceRu.html b/client/doc/user-manual/Gnumed/GmManualClientMaintenanceRu.html
index aa8d392..313ef7b 100644
--- a/client/doc/user-manual/Gnumed/GmManualClientMaintenanceRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualClientMaintenanceRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientMaintenanceRu?t=1448132841" type="application/x-wiki" title="edit GmManualClientMaintenanceRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualClientMaintenanceRu?t=1504184940" type="application/x-wiki" title="edit GmManualClientMaintenanceRu" />
 	<meta name="description" content="GmManualClientMaintenanceRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualClientMaintenanceRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigFiles.html b/client/doc/user-manual/Gnumed/GmManualConfigFiles.html
index 9bb06eb..8e2f996 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigFiles.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigFiles.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigFiles?t=1448132842" type="application/x-wiki" title="edit GmManualConfigFiles" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigFiles?t=1504184940" type="application/x-wiki" title="edit GmManualConfigFiles" />
 	<meta name="description" content="GmManualConfigFiles" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigFiles" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigFilesRu.html b/client/doc/user-manual/Gnumed/GmManualConfigFilesRu.html
index a9a4695..25cfcfc 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigFilesRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigFilesRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigFilesRu?t=1448132842" type="application/x-wiki" title="edit GmManualConfigFilesRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigFilesRu?t=1504184940" type="application/x-wiki" title="edit GmManualConfigFilesRu" />
 	<meta name="description" content="GmManualConfigFilesRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigFilesRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigPatientSearch.html b/client/doc/user-manual/Gnumed/GmManualConfigPatientSearch.html
index 5c0e56c..44f8ce9 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigPatientSearch.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigPatientSearch.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigPatientSearch?t=1448132842" type="application/x-wiki" title="edit GmManualConfigPatientSearch" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigPatientSearch?t=1504184940" type="application/x-wiki" title="edit GmManualConfigPatientSearch" />
 	<meta name="description" content="GmManualConfigPatientSearch" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigPatientSearch" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigPatientSearchRu.html b/client/doc/user-manual/Gnumed/GmManualConfigPatientSearchRu.html
index fe58161..5722b46 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigPatientSearchRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigPatientSearchRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigPatientSearchRu?t=1448132842" type="application/x-wiki" title="edit GmManualConfigPatientSearchRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigPatientSearchRu?t=1504184940" type="application/x-wiki" title="edit GmManualConfigPatientSearchRu" />
 	<meta name="description" content="GmManualConfigPatientSearchRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigPatientSearchRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigureClientOptions.html b/client/doc/user-manual/Gnumed/GmManualConfigureClientOptions.html
index abc086e..7524116 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigureClientOptions.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigureClientOptions.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigureClientOptions?t=1448132842" type="application/x-wiki" title="edit GmManualConfigureClientOptions" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigureClientOptions?t=1504184940" type="application/x-wiki" title="edit GmManualConfigureClientOptions" />
 	<meta name="description" content="GmManualConfigureClientOptions" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigureClientOptions" /> <!-- TOPIC -->
@@ -57,6 +57,7 @@ pre {
 </li> <li> <a href="#A_61gm_45fax_doc_61"> gm-fax_doc </a>
 </li> <li> <a href="#A_61gm_45mail_doc_61"> gm-mail_doc </a>
 </li> <li> <a href="#A_61gm_45convert_file_61"> gm-convert_file </a>
+</li> <li> <a href="#A_61gm_45describe_file_61"> gm-describe_file </a>
 </li></ul> 
 </li></ul> 
 </li></ul> 
@@ -90,6 +91,11 @@ This script is invoked whenever GNUmed needs to convert a file from one format i
 <p></p>
 Currently this only happens when a <a href="GmManualLettersForms.html#Placeholders" target="_top">placeholder</a> (such as <code>$<patient_photo::...::length>$</code> exports an image and the user requested it be converted into a certain image format.
 <p></p>
+<h3><a name="A_61gm_45describe_file_61"></a>  <code><a href="https://github.com/ncqgm/gnumed/blob/master/gnumed/gnumed/external-tools/gm-describe_file" target="_top">gm-describe_file</a></code> </h3>
+<p></p>
+This script is invoked whenever GNUmed needs to extract metainformation from a file for display to the user.
+<p></p>
+<p></p>
 <a name="TopicEnd"></a>
 <p></p>
 <p></p>
diff --git a/client/doc/user-manual/Gnumed/GmManualConfigureClientOptionsRu.html b/client/doc/user-manual/Gnumed/GmManualConfigureClientOptionsRu.html
index 565d74b..f798c3d 100644
--- a/client/doc/user-manual/Gnumed/GmManualConfigureClientOptionsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualConfigureClientOptionsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigureClientOptionsRu?t=1448132842" type="application/x-wiki" title="edit GmManualConfigureClientOptionsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualConfigureClientOptionsRu?t=1504184940" type="application/x-wiki" title="edit GmManualConfigureClientOptionsRu" />
 	<meta name="description" content="GmManualConfigureClientOptionsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualConfigureClientOptionsRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLogin.html b/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLogin.html
index af9254d..1ec195a 100644
--- a/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLogin.html
+++ b/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLogin.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingBackendLogin?t=1448132842" type="application/x-wiki" title="edit GmManualCustomizingBackendLogin" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingBackendLogin?t=1504184940" type="application/x-wiki" title="edit GmManualCustomizingBackendLogin" />
 	<meta name="description" content="GmManualCustomizingBackendLogin" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualCustomizingBackendLogin" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLoginRu.html b/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLoginRu.html
index c98c78c..811d342 100644
--- a/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLoginRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualCustomizingBackendLoginRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingBackendLoginRu?t=1448132842" type="application/x-wiki" title="edit GmManualCustomizingBackendLoginRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingBackendLoginRu?t=1504184940" type="application/x-wiki" title="edit GmManualCustomizingBackendLoginRu" />
 	<meta name="description" content="GmManualCustomizingBackendLoginRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualCustomizingBackendLoginRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartup.html b/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartup.html
index 83f7c8d..47ce284 100644
--- a/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartup.html
+++ b/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartup.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingClientStartup?t=1448132842" type="application/x-wiki" title="edit GmManualCustomizingClientStartup" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingClientStartup?t=1504184940" type="application/x-wiki" title="edit GmManualCustomizingClientStartup" />
 	<meta name="description" content="GmManualCustomizingClientStartup" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualCustomizingClientStartup" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartupRu.html b/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartupRu.html
index 5138b76..54d2625 100644
--- a/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartupRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualCustomizingClientStartupRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingClientStartupRu?t=1448132842" type="application/x-wiki" title="edit GmManualCustomizingClientStartupRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualCustomizingClientStartupRu?t=1504184940" type="application/x-wiki" title="edit GmManualCustomizingClientStartupRu" />
 	<meta name="description" content="GmManualCustomizingClientStartupRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualCustomizingClientStartupRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestore.html b/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestore.html
index 1c8eeea..862c804 100644
--- a/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestore.html
+++ b/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestore.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDatabaseBackupRestore?t=1448132842" type="application/x-wiki" title="edit GmManualDatabaseBackupRestore" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDatabaseBackupRestore?t=1504184940" type="application/x-wiki" title="edit GmManualDatabaseBackupRestore" />
 	<meta name="description" content="GmManualDatabaseBackupRestore" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDatabaseBackupRestore" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestoreRu.html b/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestoreRu.html
index 0330cfe..42143dd 100644
--- a/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestoreRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualDatabaseBackupRestoreRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDatabaseBackupRestoreRu?t=1448132842" type="application/x-wiki" title="edit GmManualDatabaseBackupRestoreRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDatabaseBackupRestoreRu?t=1504184940" type="application/x-wiki" title="edit GmManualDatabaseBackupRestoreRu" />
 	<meta name="description" content="GmManualDatabaseBackupRestoreRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDatabaseBackupRestoreRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDocManagementCfg.html b/client/doc/user-manual/Gnumed/GmManualDocManagementCfg.html
index e8a9123..6a5d6e6 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocManagementCfg.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocManagementCfg.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocManagementCfg?t=1448132842" type="application/x-wiki" title="edit GmManualDocManagementCfg" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocManagementCfg?t=1504184940" type="application/x-wiki" title="edit GmManualDocManagementCfg" />
 	<meta name="description" content="GmManualDocManagementCfg" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocManagementCfg" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualDocManagementCfgRu.html b/client/doc/user-manual/Gnumed/GmManualDocManagementCfgRu.html
index f39cfaf..79bc209 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocManagementCfgRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocManagementCfgRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocManagementCfgRu?t=1448132842" type="application/x-wiki" title="edit GmManualDocManagementCfgRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocManagementCfgRu?t=1504184940" type="application/x-wiki" title="edit GmManualDocManagementCfgRu" />
 	<meta name="description" content="GmManualDocManagementCfgRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocManagementCfgRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentImporter.html b/client/doc/user-manual/Gnumed/GmManualDocumentImporter.html
index 001cbe3..3e972f2 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentImporter.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentImporter.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentImporter?t=1448132842" type="application/x-wiki" title="edit GmManualDocumentImporter" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentImporter?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentImporter" />
 	<meta name="description" content="GmManualDocumentImporter" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentImporter" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentImporterRu.html b/client/doc/user-manual/Gnumed/GmManualDocumentImporterRu.html
index 226e198..08f3df0 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentImporterRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentImporterRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentImporterRu?t=1448132842" type="application/x-wiki" title="edit GmManualDocumentImporterRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentImporterRu?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentImporterRu" />
 	<meta name="description" content="GmManualDocumentImporterRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentImporterRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentManagementConcepts.html b/client/doc/user-manual/Gnumed/GmManualDocumentManagementConcepts.html
index dd8b8dd..63bd61b 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentManagementConcepts.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentManagementConcepts.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentManagementConcepts?t=1448132842" type="application/x-wiki" title="edit GmManualDocumentManagementConcepts" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentManagementConcepts?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentManagementConcepts" />
 	<meta name="description" content="GmManualDocumentManagementConcepts" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentManagementConcepts" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentManagementConceptsRu.html b/client/doc/user-manual/Gnumed/GmManualDocumentManagementConceptsRu.html
index 665c8b2..1846f75 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentManagementConceptsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentManagementConceptsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentManagementConceptsRu?t=1448132842" type="application/x-wiki" title="edit GmManualDocumentManagementConceptsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentManagementConceptsRu?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentManagementConceptsRu" />
 	<meta name="description" content="GmManualDocumentManagementConceptsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentManagementConceptsRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentViewer.html b/client/doc/user-manual/Gnumed/GmManualDocumentViewer.html
index 6c44c26..9abf149 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentViewer.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentViewer.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentViewer?t=1448132843" type="application/x-wiki" title="edit GmManualDocumentViewer" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentViewer?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentViewer" />
 	<meta name="description" content="GmManualDocumentViewer" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentViewer" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualDocumentViewerRu.html b/client/doc/user-manual/Gnumed/GmManualDocumentViewerRu.html
index fc11454..528ba9f 100644
--- a/client/doc/user-manual/Gnumed/GmManualDocumentViewerRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualDocumentViewerRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentViewerRu?t=1448132843" type="application/x-wiki" title="edit GmManualDocumentViewerRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualDocumentViewerRu?t=1504184940" type="application/x-wiki" title="edit GmManualDocumentViewerRu" />
 	<meta name="description" content="GmManualDocumentViewerRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualDocumentViewerRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualExternalPatientImport.html b/client/doc/user-manual/Gnumed/GmManualExternalPatientImport.html
index 4a26f01..95a5205 100644
--- a/client/doc/user-manual/Gnumed/GmManualExternalPatientImport.html
+++ b/client/doc/user-manual/Gnumed/GmManualExternalPatientImport.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualExternalPatientImport?t=1448132843" type="application/x-wiki" title="edit GmManualExternalPatientImport" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualExternalPatientImport?t=1504184940" type="application/x-wiki" title="edit GmManualExternalPatientImport" />
 	<meta name="description" content="GmManualExternalPatientImport" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualExternalPatientImport" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualExternalPatientImportRu.html b/client/doc/user-manual/Gnumed/GmManualExternalPatientImportRu.html
index f58f05e..0c22c41 100644
--- a/client/doc/user-manual/Gnumed/GmManualExternalPatientImportRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualExternalPatientImportRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualExternalPatientImportRu?t=1448132843" type="application/x-wiki" title="edit GmManualExternalPatientImportRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualExternalPatientImportRu?t=1504184941" type="application/x-wiki" title="edit GmManualExternalPatientImportRu" />
 	<meta name="description" content="GmManualExternalPatientImportRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualExternalPatientImportRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualGermanKVKInterface.html b/client/doc/user-manual/Gnumed/GmManualGermanKVKInterface.html
index 4084378..0e6adf7 100644
--- a/client/doc/user-manual/Gnumed/GmManualGermanKVKInterface.html
+++ b/client/doc/user-manual/Gnumed/GmManualGermanKVKInterface.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGermanKVKInterface?t=1448132843" type="application/x-wiki" title="edit GmManualGermanKVKInterface" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGermanKVKInterface?t=1504184941" type="application/x-wiki" title="edit GmManualGermanKVKInterface" />
 	<meta name="description" content="GmManualGermanKVKInterface" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualGermanKVKInterface" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualGuiElements.html b/client/doc/user-manual/Gnumed/GmManualGuiElements.html
index 2297cf2..39f203d 100644
--- a/client/doc/user-manual/Gnumed/GmManualGuiElements.html
+++ b/client/doc/user-manual/Gnumed/GmManualGuiElements.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGuiElements?t=1448132843" type="application/x-wiki" title="edit GmManualGuiElements" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGuiElements?t=1504184941" type="application/x-wiki" title="edit GmManualGuiElements" />
 	<meta name="description" content="GmManualGuiElements" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualGuiElements" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualGuiElementsRu.html b/client/doc/user-manual/Gnumed/GmManualGuiElementsRu.html
index 972ca60..5480293 100644
--- a/client/doc/user-manual/Gnumed/GmManualGuiElementsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualGuiElementsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGuiElementsRu?t=1448132843" type="application/x-wiki" title="edit GmManualGuiElementsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualGuiElementsRu?t=1504184941" type="application/x-wiki" title="edit GmManualGuiElementsRu" />
 	<meta name="description" content="GmManualGuiElementsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualGuiElementsRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualHooksFramework.html b/client/doc/user-manual/Gnumed/GmManualHooksFramework.html
index f51f8f7..1e2a144 100644
--- a/client/doc/user-manual/Gnumed/GmManualHooksFramework.html
+++ b/client/doc/user-manual/Gnumed/GmManualHooksFramework.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualHooksFramework?t=1448132843" type="application/x-wiki" title="edit GmManualHooksFramework" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualHooksFramework?t=1504184941" type="application/x-wiki" title="edit GmManualHooksFramework" />
 	<meta name="description" content="GmManualHooksFramework" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualHooksFramework" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualHooksFrameworkRu.html b/client/doc/user-manual/Gnumed/GmManualHooksFrameworkRu.html
index a3e79cd..93d6e49 100644
--- a/client/doc/user-manual/Gnumed/GmManualHooksFrameworkRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualHooksFrameworkRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualHooksFrameworkRu?t=1448132843" type="application/x-wiki" title="edit GmManualHooksFrameworkRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualHooksFrameworkRu?t=1504184941" type="application/x-wiki" title="edit GmManualHooksFrameworkRu" />
 	<meta name="description" content="GmManualHooksFrameworkRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualHooksFrameworkRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualLettersForms.html b/client/doc/user-manual/Gnumed/GmManualLettersForms.html
index f1edadd..2fa6c0a 100644
--- a/client/doc/user-manual/Gnumed/GmManualLettersForms.html
+++ b/client/doc/user-manual/Gnumed/GmManualLettersForms.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualLettersForms?t=1448132843" type="application/x-wiki" title="edit GmManualLettersForms" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualLettersForms?t=1504184941" type="application/x-wiki" title="edit GmManualLettersForms" />
 	<meta name="description" content="GmManualLettersForms" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualLettersForms" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualLettersFormsRu.html b/client/doc/user-manual/Gnumed/GmManualLettersFormsRu.html
index 4277a0d..c52a494 100644
--- a/client/doc/user-manual/Gnumed/GmManualLettersFormsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualLettersFormsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualLettersFormsRu?t=1448132843" type="application/x-wiki" title="edit GmManualLettersFormsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualLettersFormsRu?t=1504184941" type="application/x-wiki" title="edit GmManualLettersFormsRu" />
 	<meta name="description" content="GmManualLettersFormsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualLettersFormsRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManageMasterData.html b/client/doc/user-manual/Gnumed/GmManualManageMasterData.html
index 48cd6e5..2ab47ec 100644
--- a/client/doc/user-manual/Gnumed/GmManualManageMasterData.html
+++ b/client/doc/user-manual/Gnumed/GmManualManageMasterData.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManageMasterData?t=1448132843" type="application/x-wiki" title="edit GmManualManageMasterData" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManageMasterData?t=1504184941" type="application/x-wiki" title="edit GmManualManageMasterData" />
 	<meta name="description" content="GmManualManageMasterData" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManageMasterData" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualManageMasterDataRu.html b/client/doc/user-manual/Gnumed/GmManualManageMasterDataRu.html
index 12ad857..ee39a1e 100644
--- a/client/doc/user-manual/Gnumed/GmManualManageMasterDataRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualManageMasterDataRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManageMasterDataRu?t=1448132843" type="application/x-wiki" title="edit GmManualManageMasterDataRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManageMasterDataRu?t=1504184941" type="application/x-wiki" title="edit GmManualManageMasterDataRu" />
 	<meta name="description" content="GmManualManageMasterDataRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManageMasterDataRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingAllergies.html b/client/doc/user-manual/Gnumed/GmManualManagingAllergies.html
index 89f8724..245f24a 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingAllergies.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingAllergies.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingAllergies?t=1448132843" type="application/x-wiki" title="edit GmManualManagingAllergies" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingAllergies?t=1504184941" type="application/x-wiki" title="edit GmManualManagingAllergies" />
 	<meta name="description" content="GmManualManagingAllergies" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingAllergies" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingAllergiesRu.html b/client/doc/user-manual/Gnumed/GmManualManagingAllergiesRu.html
index 231f169..4efc3cd 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingAllergiesRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingAllergiesRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingAllergiesRu?t=1448132843" type="application/x-wiki" title="edit GmManualManagingAllergiesRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingAllergiesRu?t=1504184941" type="application/x-wiki" title="edit GmManualManagingAllergiesRu" />
 	<meta name="description" content="GmManualManagingAllergiesRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingAllergiesRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingHospitalStays.html b/client/doc/user-manual/Gnumed/GmManualManagingHospitalStays.html
index bf6bfba..db32c2d 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingHospitalStays.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingHospitalStays.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingHospitalStays?t=1448132844" type="application/x-wiki" title="edit GmManualManagingHospitalStays" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingHospitalStays?t=1504184941" type="application/x-wiki" title="edit GmManualManagingHospitalStays" />
 	<meta name="description" content="GmManualManagingHospitalStays" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingHospitalStays" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingHospitalStaysRu.html b/client/doc/user-manual/Gnumed/GmManualManagingHospitalStaysRu.html
index e10ae74..1811e6f 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingHospitalStaysRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingHospitalStaysRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingHospitalStaysRu?t=1448132844" type="application/x-wiki" title="edit GmManualManagingHospitalStaysRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingHospitalStaysRu?t=1504184941" type="application/x-wiki" title="edit GmManualManagingHospitalStaysRu" />
 	<meta name="description" content="GmManualManagingHospitalStaysRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingHospitalStaysRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingOrgsPraxis.html b/client/doc/user-manual/Gnumed/GmManualManagingOrgsPraxis.html
index 1576e35..e295010 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingOrgsPraxis.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingOrgsPraxis.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingOrgsPraxis?t=1448132844" type="application/x-wiki" title="edit GmManualManagingOrgsPraxis" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingOrgsPraxis?t=1504184941" type="application/x-wiki" title="edit GmManualManagingOrgsPraxis" />
 	<meta name="description" content="GmManualManagingOrgsPraxis" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingOrgsPraxis" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingProcedures.html b/client/doc/user-manual/Gnumed/GmManualManagingProcedures.html
index e51d28d..5c7fb70 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingProcedures.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingProcedures.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingProcedures?t=1448132844" type="application/x-wiki" title="edit GmManualManagingProcedures" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingProcedures?t=1504184941" type="application/x-wiki" title="edit GmManualManagingProcedures" />
 	<meta name="description" content="GmManualManagingProcedures" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingProcedures" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingProceduresRu.html b/client/doc/user-manual/Gnumed/GmManualManagingProceduresRu.html
index 4e37e3c..a34d93c 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingProceduresRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingProceduresRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingProceduresRu?t=1448132844" type="application/x-wiki" title="edit GmManualManagingProceduresRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingProceduresRu?t=1504184941" type="application/x-wiki" title="edit GmManualManagingProceduresRu" />
 	<meta name="description" content="GmManualManagingProceduresRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingProceduresRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingUsers.html b/client/doc/user-manual/Gnumed/GmManualManagingUsers.html
index 7ee92ce..5c4ed35 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingUsers.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingUsers.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingUsers?t=1448132844" type="application/x-wiki" title="edit GmManualManagingUsers" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingUsers?t=1504184941" type="application/x-wiki" title="edit GmManualManagingUsers" />
 	<meta name="description" content="GmManualManagingUsers" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingUsers" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualManagingUsersRu.html b/client/doc/user-manual/Gnumed/GmManualManagingUsersRu.html
index 2de5a78..280a70a 100644
--- a/client/doc/user-manual/Gnumed/GmManualManagingUsersRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualManagingUsersRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingUsersRu?t=1448132844" type="application/x-wiki" title="edit GmManualManagingUsersRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualManagingUsersRu?t=1504184941" type="application/x-wiki" title="edit GmManualManagingUsersRu" />
 	<meta name="description" content="GmManualManagingUsersRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualManagingUsersRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualPatientPhotographs.html b/client/doc/user-manual/Gnumed/GmManualPatientPhotographs.html
index da89a0e..0f39009 100644
--- a/client/doc/user-manual/Gnumed/GmManualPatientPhotographs.html
+++ b/client/doc/user-manual/Gnumed/GmManualPatientPhotographs.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPatientPhotographs?t=1448132844" type="application/x-wiki" title="edit GmManualPatientPhotographs" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPatientPhotographs?t=1504184941" type="application/x-wiki" title="edit GmManualPatientPhotographs" />
 	<meta name="description" content="GmManualPatientPhotographs" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualPatientPhotographs" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualPatientPhotographsRu.html b/client/doc/user-manual/Gnumed/GmManualPatientPhotographsRu.html
index 20575fc..12cf8b3 100644
--- a/client/doc/user-manual/Gnumed/GmManualPatientPhotographsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualPatientPhotographsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPatientPhotographsRu?t=1448132844" type="application/x-wiki" title="edit GmManualPatientPhotographsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPatientPhotographsRu?t=1504184941" type="application/x-wiki" title="edit GmManualPatientPhotographsRu" />
 	<meta name="description" content="GmManualPatientPhotographsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualPatientPhotographsRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualPlaceholderReference.html b/client/doc/user-manual/Gnumed/GmManualPlaceholderReference.html
index f7b2358..6143a91 100644
--- a/client/doc/user-manual/Gnumed/GmManualPlaceholderReference.html
+++ b/client/doc/user-manual/Gnumed/GmManualPlaceholderReference.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPlaceholderReference?t=1448132844" type="application/x-wiki" title="edit GmManualPlaceholderReference" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualPlaceholderReference?t=1504184941" type="application/x-wiki" title="edit GmManualPlaceholderReference" />
 	<meta name="description" content="GmManualPlaceholderReference" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualPlaceholderReference" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualReferenceData.html b/client/doc/user-manual/Gnumed/GmManualReferenceData.html
index 3d78acc..85abfb0 100644
--- a/client/doc/user-manual/Gnumed/GmManualReferenceData.html
+++ b/client/doc/user-manual/Gnumed/GmManualReferenceData.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReferenceData?t=1448132844" type="application/x-wiki" title="edit GmManualReferenceData" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReferenceData?t=1504184941" type="application/x-wiki" title="edit GmManualReferenceData" />
 	<meta name="description" content="GmManualReferenceData" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualReferenceData" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualReferenceDataRu.html b/client/doc/user-manual/Gnumed/GmManualReferenceDataRu.html
index f1e257b..ebc94f5 100644
--- a/client/doc/user-manual/Gnumed/GmManualReferenceDataRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualReferenceDataRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReferenceDataRu?t=1448132844" type="application/x-wiki" title="edit GmManualReferenceDataRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReferenceDataRu?t=1504184941" type="application/x-wiki" title="edit GmManualReferenceDataRu" />
 	<meta name="description" content="GmManualReferenceDataRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualReferenceDataRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualReportGenerator.html b/client/doc/user-manual/Gnumed/GmManualReportGenerator.html
index 2a75771..cd7026a 100644
--- a/client/doc/user-manual/Gnumed/GmManualReportGenerator.html
+++ b/client/doc/user-manual/Gnumed/GmManualReportGenerator.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReportGenerator?t=1448132844" type="application/x-wiki" title="edit GmManualReportGenerator" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReportGenerator?t=1504184941" type="application/x-wiki" title="edit GmManualReportGenerator" />
 	<meta name="description" content="GmManualReportGenerator" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualReportGenerator" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualReportGeneratorRu.html b/client/doc/user-manual/Gnumed/GmManualReportGeneratorRu.html
index a9fd785..2323129 100644
--- a/client/doc/user-manual/Gnumed/GmManualReportGeneratorRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualReportGeneratorRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReportGeneratorRu?t=1448132844" type="application/x-wiki" title="edit GmManualReportGeneratorRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualReportGeneratorRu?t=1504184941" type="application/x-wiki" title="edit GmManualReportGeneratorRu" />
 	<meta name="description" content="GmManualReportGeneratorRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualReportGeneratorRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualServerInstall.html b/client/doc/user-manual/Gnumed/GmManualServerInstall.html
index ff16b00..d4de4f6 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerInstall.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerInstall.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerInstall?t=1448132844" type="application/x-wiki" title="edit GmManualServerInstall" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerInstall?t=1504184941" type="application/x-wiki" title="edit GmManualServerInstall" />
 	<meta name="description" content="GmManualServerInstall" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerInstall" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualServerInstallRu.html b/client/doc/user-manual/Gnumed/GmManualServerInstallRu.html
index 10cc777..ac548ce 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerInstallRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerInstallRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerInstallRu?t=1448132844" type="application/x-wiki" title="edit GmManualServerInstallRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerInstallRu?t=1504184941" type="application/x-wiki" title="edit GmManualServerInstallRu" />
 	<meta name="description" content="GmManualServerInstallRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerInstallRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualServerIntoProduction.html b/client/doc/user-manual/Gnumed/GmManualServerIntoProduction.html
index 4dd4b37..dd91117 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerIntoProduction.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerIntoProduction.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerIntoProduction?t=1448132845" type="application/x-wiki" title="edit GmManualServerIntoProduction" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerIntoProduction?t=1504184941" type="application/x-wiki" title="edit GmManualServerIntoProduction" />
 	<meta name="description" content="GmManualServerIntoProduction" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerIntoProduction" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualServerIntoProductionRu.html b/client/doc/user-manual/Gnumed/GmManualServerIntoProductionRu.html
index c773644..44e7b0f 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerIntoProductionRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerIntoProductionRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerIntoProductionRu?t=1448132845" type="application/x-wiki" title="edit GmManualServerIntoProductionRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerIntoProductionRu?t=1504184941" type="application/x-wiki" title="edit GmManualServerIntoProductionRu" />
 	<meta name="description" content="GmManualServerIntoProductionRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerIntoProductionRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualServerUpgrade.html b/client/doc/user-manual/Gnumed/GmManualServerUpgrade.html
index 3699549..b1d001c 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerUpgrade.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerUpgrade.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerUpgrade?t=1448132845" type="application/x-wiki" title="edit GmManualServerUpgrade" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerUpgrade?t=1504184941" type="application/x-wiki" title="edit GmManualServerUpgrade" />
 	<meta name="description" content="GmManualServerUpgrade" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerUpgrade" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualServerUpgradeRu.html b/client/doc/user-manual/Gnumed/GmManualServerUpgradeRu.html
index 892ba01..8ef12c6 100644
--- a/client/doc/user-manual/Gnumed/GmManualServerUpgradeRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualServerUpgradeRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerUpgradeRu?t=1448132845" type="application/x-wiki" title="edit GmManualServerUpgradeRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualServerUpgradeRu?t=1504184942" type="application/x-wiki" title="edit GmManualServerUpgradeRu" />
 	<meta name="description" content="GmManualServerUpgradeRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualServerUpgradeRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualStartingGnumed.html b/client/doc/user-manual/Gnumed/GmManualStartingGnumed.html
index c9afd87..9c2ccb1 100644
--- a/client/doc/user-manual/Gnumed/GmManualStartingGnumed.html
+++ b/client/doc/user-manual/Gnumed/GmManualStartingGnumed.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualStartingGnumed?t=1448132845" type="application/x-wiki" title="edit GmManualStartingGnumed" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualStartingGnumed?t=1504184942" type="application/x-wiki" title="edit GmManualStartingGnumed" />
 	<meta name="description" content="GmManualStartingGnumed" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualStartingGnumed" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualStartingGnumedRu.html b/client/doc/user-manual/Gnumed/GmManualStartingGnumedRu.html
index d52e4d9..3566186 100644
--- a/client/doc/user-manual/Gnumed/GmManualStartingGnumedRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualStartingGnumedRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualStartingGnumedRu?t=1448132845" type="application/x-wiki" title="edit GmManualStartingGnumedRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualStartingGnumedRu?t=1504184942" type="application/x-wiki" title="edit GmManualStartingGnumedRu" />
 	<meta name="description" content="GmManualStartingGnumedRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualStartingGnumedRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualSubstanceUseConcepts.html b/client/doc/user-manual/Gnumed/GmManualSubstanceUseConcepts.html
index 24c8348..374b5df 100644
--- a/client/doc/user-manual/Gnumed/GmManualSubstanceUseConcepts.html
+++ b/client/doc/user-manual/Gnumed/GmManualSubstanceUseConcepts.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualSubstanceUseConcepts?t=1448132845" type="application/x-wiki" title="edit GmManualSubstanceUseConcepts" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualSubstanceUseConcepts?t=1504184942" type="application/x-wiki" title="edit GmManualSubstanceUseConcepts" />
 	<meta name="description" content="GmManualSubstanceUseConcepts" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualSubstanceUseConcepts" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualSubstanceUseConceptsRu.html b/client/doc/user-manual/Gnumed/GmManualSubstanceUseConceptsRu.html
index d0b996d..ddd9ee9 100644
--- a/client/doc/user-manual/Gnumed/GmManualSubstanceUseConceptsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualSubstanceUseConceptsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualSubstanceUseConceptsRu?t=1448132845" type="application/x-wiki" title="edit GmManualSubstanceUseConceptsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualSubstanceUseConceptsRu?t=1504184942" type="application/x-wiki" title="edit GmManualSubstanceUseConceptsRu" />
 	<meta name="description" content="GmManualSubstanceUseConceptsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualSubstanceUseConceptsRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultConcepts.html b/client/doc/user-manual/Gnumed/GmManualTestResultConcepts.html
index d9f4f15..aff8661 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultConcepts.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultConcepts.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultConcepts?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultConcepts" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultConcepts?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultConcepts" />
 	<meta name="description" content="GmManualTestResultConcepts" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultConcepts" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultConceptsRu.html b/client/doc/user-manual/Gnumed/GmManualTestResultConceptsRu.html
index a4919f8..8474a23 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultConceptsRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultConceptsRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultConceptsRu?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultConceptsRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultConceptsRu?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultConceptsRu" />
 	<meta name="description" content="GmManualTestResultConceptsRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultConceptsRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultImport.html b/client/doc/user-manual/Gnumed/GmManualTestResultImport.html
index 06458fd..fd18c80 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultImport.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultImport.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultImport?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultImport" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultImport?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultImport" />
 	<meta name="description" content="GmManualTestResultImport" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultImport" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultImportRu.html b/client/doc/user-manual/Gnumed/GmManualTestResultImportRu.html
index 5c72d2c..1f6d8d8 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultImportRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultImportRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultImportRu?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultImportRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultImportRu?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultImportRu" />
 	<meta name="description" content="GmManualTestResultImportRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultImportRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultViewer.html b/client/doc/user-manual/Gnumed/GmManualTestResultViewer.html
index f091c3b..e47cfa4 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultViewer.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultViewer.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultViewer?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultViewer" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultViewer?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultViewer" />
 	<meta name="description" content="GmManualTestResultViewer" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultViewer" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualTestResultViewerRu.html b/client/doc/user-manual/Gnumed/GmManualTestResultViewerRu.html
index 88179d7..3eb841e 100644
--- a/client/doc/user-manual/Gnumed/GmManualTestResultViewerRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualTestResultViewerRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultViewerRu?t=1448132845" type="application/x-wiki" title="edit GmManualTestResultViewerRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualTestResultViewerRu?t=1504184942" type="application/x-wiki" title="edit GmManualTestResultViewerRu" />
 	<meta name="description" content="GmManualTestResultViewerRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualTestResultViewerRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualUserInterface.html b/client/doc/user-manual/Gnumed/GmManualUserInterface.html
index 8d087b6..302ff8a 100644
--- a/client/doc/user-manual/Gnumed/GmManualUserInterface.html
+++ b/client/doc/user-manual/Gnumed/GmManualUserInterface.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualUserInterface?t=1448132845" type="application/x-wiki" title="edit GmManualUserInterface" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualUserInterface?t=1504184942" type="application/x-wiki" title="edit GmManualUserInterface" />
 	<meta name="description" content="GmManualUserInterface" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualUserInterface" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualUserInterfaceRu.html b/client/doc/user-manual/Gnumed/GmManualUserInterfaceRu.html
index 56e4dc0..b8c391a 100644
--- a/client/doc/user-manual/Gnumed/GmManualUserInterfaceRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualUserInterfaceRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualUserInterfaceRu?t=1448132846" type="application/x-wiki" title="edit GmManualUserInterfaceRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualUserInterfaceRu?t=1504184942" type="application/x-wiki" title="edit GmManualUserInterfaceRu" />
 	<meta name="description" content="GmManualUserInterfaceRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualUserInterfaceRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualVaccinationHandling.html b/client/doc/user-manual/Gnumed/GmManualVaccinationHandling.html
index be4f2cb..2042a7f 100644
--- a/client/doc/user-manual/Gnumed/GmManualVaccinationHandling.html
+++ b/client/doc/user-manual/Gnumed/GmManualVaccinationHandling.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVaccinationHandling?t=1448132846" type="application/x-wiki" title="edit GmManualVaccinationHandling" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVaccinationHandling?t=1504184942" type="application/x-wiki" title="edit GmManualVaccinationHandling" />
 	<meta name="description" content="GmManualVaccinationHandling" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualVaccinationHandling" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualVaccinationHandlingRu.html b/client/doc/user-manual/Gnumed/GmManualVaccinationHandlingRu.html
index da083ab..d6f0abe 100644
--- a/client/doc/user-manual/Gnumed/GmManualVaccinationHandlingRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualVaccinationHandlingRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVaccinationHandlingRu?t=1448132846" type="application/x-wiki" title="edit GmManualVaccinationHandlingRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVaccinationHandlingRu?t=1504184942" type="application/x-wiki" title="edit GmManualVaccinationHandlingRu" />
 	<meta name="description" content="GmManualVaccinationHandlingRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualVaccinationHandlingRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualVisualProgressNotes.html b/client/doc/user-manual/Gnumed/GmManualVisualProgressNotes.html
index f59279f..9b9d08a 100644
--- a/client/doc/user-manual/Gnumed/GmManualVisualProgressNotes.html
+++ b/client/doc/user-manual/Gnumed/GmManualVisualProgressNotes.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVisualProgressNotes?t=1448132846" type="application/x-wiki" title="edit GmManualVisualProgressNotes" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVisualProgressNotes?t=1504184942" type="application/x-wiki" title="edit GmManualVisualProgressNotes" />
 	<meta name="description" content="GmManualVisualProgressNotes" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualVisualProgressNotes" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualVisualProgressNotesRu.html b/client/doc/user-manual/Gnumed/GmManualVisualProgressNotesRu.html
index ea8ba6f..ff2a53b 100644
--- a/client/doc/user-manual/Gnumed/GmManualVisualProgressNotesRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualVisualProgressNotesRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVisualProgressNotesRu?t=1448132846" type="application/x-wiki" title="edit GmManualVisualProgressNotesRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualVisualProgressNotesRu?t=1504184942" type="application/x-wiki" title="edit GmManualVisualProgressNotesRu" />
 	<meta name="description" content="GmManualVisualProgressNotesRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualVisualProgressNotesRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualWaitingList.html b/client/doc/user-manual/Gnumed/GmManualWaitingList.html
index b1a2ee0..87b7f34 100644
--- a/client/doc/user-manual/Gnumed/GmManualWaitingList.html
+++ b/client/doc/user-manual/Gnumed/GmManualWaitingList.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualWaitingList?t=1448132846" type="application/x-wiki" title="edit GmManualWaitingList" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualWaitingList?t=1504184942" type="application/x-wiki" title="edit GmManualWaitingList" />
 	<meta name="description" content="GmManualWaitingList" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualWaitingList" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualWaitingListRu.html b/client/doc/user-manual/Gnumed/GmManualWaitingListRu.html
index 0cbd71f..8209e13 100644
--- a/client/doc/user-manual/Gnumed/GmManualWaitingListRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualWaitingListRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualWaitingListRu?t=1448132846" type="application/x-wiki" title="edit GmManualWaitingListRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualWaitingListRu?t=1504184942" type="application/x-wiki" title="edit GmManualWaitingListRu" />
 	<meta name="description" content="GmManualWaitingListRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualWaitingListRu" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/GmManualXmlRpcApi.html b/client/doc/user-manual/Gnumed/GmManualXmlRpcApi.html
index c101bf8..7081d2d 100644
--- a/client/doc/user-manual/Gnumed/GmManualXmlRpcApi.html
+++ b/client/doc/user-manual/Gnumed/GmManualXmlRpcApi.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualXmlRpcApi?t=1448132846" type="application/x-wiki" title="edit GmManualXmlRpcApi" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualXmlRpcApi?t=1504184942" type="application/x-wiki" title="edit GmManualXmlRpcApi" />
 	<meta name="description" content="GmManualXmlRpcApi" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualXmlRpcApi" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GmManualXmlRpcApiRu.html b/client/doc/user-manual/Gnumed/GmManualXmlRpcApiRu.html
index c978780..25a8da5 100644
--- a/client/doc/user-manual/Gnumed/GmManualXmlRpcApiRu.html
+++ b/client/doc/user-manual/Gnumed/GmManualXmlRpcApiRu.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualXmlRpcApiRu?t=1448132846" type="application/x-wiki" title="edit GmManualXmlRpcApiRu" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GmManualXmlRpcApiRu?t=1504184942" type="application/x-wiki" title="edit GmManualXmlRpcApiRu" />
 	<meta name="description" content="GmManualXmlRpcApiRu" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GmManualXmlRpcApiRu" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GnumedManual.html b/client/doc/user-manual/Gnumed/GnumedManual.html
index 40779fe..d14a2cb 100644
--- a/client/doc/user-manual/Gnumed/GnumedManual.html
+++ b/client/doc/user-manual/Gnumed/GnumedManual.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GnumedManual?t=1448132846" type="application/x-wiki" title="edit GnumedManual" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GnumedManual?t=1504184942" type="application/x-wiki" title="edit GnumedManual" />
 	<meta name="description" content="GnumedManual" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GnumedManual" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/GnumedTimeConcept.html b/client/doc/user-manual/Gnumed/GnumedTimeConcept.html
index d862e6c..8657c9b 100644
--- a/client/doc/user-manual/Gnumed/GnumedTimeConcept.html
+++ b/client/doc/user-manual/Gnumed/GnumedTimeConcept.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GnumedTimeConcept?t=1448132846" type="application/x-wiki" title="edit GnumedTimeConcept" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/GnumedTimeConcept?t=1504184942" type="application/x-wiki" title="edit GnumedTimeConcept" />
 	<meta name="description" content="GnumedTimeConcept" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="GnumedTimeConcept" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/I18N.html b/client/doc/user-manual/Gnumed/I18N.html
index 24e1c4e..149538e 100644
--- a/client/doc/user-manual/Gnumed/I18N.html
+++ b/client/doc/user-manual/Gnumed/I18N.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/I18N?t=1448132846" type="application/x-wiki" title="edit I18N" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/I18N?t=1504184942" type="application/x-wiki" title="edit I18N" />
 	<meta name="description" content="I18N" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="I18N" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/InputDevices.html b/client/doc/user-manual/Gnumed/InputDevices.html
index 1f8e0cd..57d85ef 100644
--- a/client/doc/user-manual/Gnumed/InputDevices.html
+++ b/client/doc/user-manual/Gnumed/InputDevices.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/InputDevices?t=1448132846" type="application/x-wiki" title="edit InputDevices" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/InputDevices?t=1504184942" type="application/x-wiki" title="edit InputDevices" />
 	<meta name="description" content="InputDevices" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="InputDevices" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/InstallerGuideHome.html b/client/doc/user-manual/Gnumed/InstallerGuideHome.html
index 0d981f7..ed2e6af 100644
--- a/client/doc/user-manual/Gnumed/InstallerGuideHome.html
+++ b/client/doc/user-manual/Gnumed/InstallerGuideHome.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/InstallerGuideHome?t=1448132846" type="application/x-wiki" title="edit InstallerGuideHome" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/InstallerGuideHome?t=1504184942" type="application/x-wiki" title="edit InstallerGuideHome" />
 	<meta name="description" content="InstallerGuideHome" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="InstallerGuideHome" /> <!-- TOPIC -->
@@ -60,9 +60,9 @@ Any help in the updating of <a href="BinaryPackages.html">BinaryPackages</a> wou
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">User releases</a> </th>
-			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
-			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">User releases</a> </th>
+			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
+			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=19;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
 		</tr>
 	</thead>
 	<tbody>
@@ -119,9 +119,9 @@ Any help in the updating of <a href="BinaryPackages.html">BinaryPackages</a> wou
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Special releases</a> </th>
-			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
-			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Special releases</a> </th>
+			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
+			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=20;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
 		</tr>
 	</thead>
 	<tbody>
@@ -165,10 +165,10 @@ As an alternative to installing the server software (and as described elsewhere)
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Developers</a> </th>
-			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
-			<th class="foswikiTableCol3 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Download (link)</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Developers</a> </th>
+			<th align="center" class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Status</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Comments</a> </th>
+			<th class="foswikiTableCol3 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=21;up=0#sorted_table" rel="nofollow" title="Sort by this column">Download (link)</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/LabModule.html b/client/doc/user-manual/Gnumed/LabModule.html
index 09750b0..f9b2496 100644
--- a/client/doc/user-manual/Gnumed/LabModule.html
+++ b/client/doc/user-manual/Gnumed/LabModule.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LabModule?t=1448132847" type="application/x-wiki" title="edit LabModule" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LabModule?t=1504184942" type="application/x-wiki" title="edit LabModule" />
 	<meta name="description" content="LabModule" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="LabModule" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/LegacyAppAPW.html b/client/doc/user-manual/Gnumed/LegacyAppAPW.html
index 5efdd27..004f359 100644
--- a/client/doc/user-manual/Gnumed/LegacyAppAPW.html
+++ b/client/doc/user-manual/Gnumed/LegacyAppAPW.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppAPW?t=1448132847" type="application/x-wiki" title="edit LegacyAppAPW" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppAPW?t=1504184942" type="application/x-wiki" title="edit LegacyAppAPW" />
 	<meta name="description" content="LegacyAppAPW" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="LegacyAppAPW" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/LegacyAppConfiguration.html b/client/doc/user-manual/Gnumed/LegacyAppConfiguration.html
index 71aa26e..99b1865 100644
--- a/client/doc/user-manual/Gnumed/LegacyAppConfiguration.html
+++ b/client/doc/user-manual/Gnumed/LegacyAppConfiguration.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppConfiguration?t=1448132847" type="application/x-wiki" title="edit LegacyAppConfiguration" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppConfiguration?t=1504184942" type="application/x-wiki" title="edit LegacyAppConfiguration" />
 	<meta name="description" content="LegacyAppConfiguration" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -78,7 +78,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="LegacyAppConfiguration" /> <!-- TOPIC -->
@@ -89,8 +89,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
@@ -217,13 +217,13 @@ Eine komplette Beispieldatei f
 <table border="1" class="foswikiTable" id="tablePublishManual22" rules="none" summary="Topic-Anh�nge"><caption>Topic-Anh�nge</caption>
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
-			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
-			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=4;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
-			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=5;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
-			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=6;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
+			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
+			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=4;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
+			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=5;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
+			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=6;table=22;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/LegacyAppDocConcept.html b/client/doc/user-manual/Gnumed/LegacyAppDocConcept.html
index 17ecb44..903d79c 100644
--- a/client/doc/user-manual/Gnumed/LegacyAppDocConcept.html
+++ b/client/doc/user-manual/Gnumed/LegacyAppDocConcept.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppDocConcept?t=1448132847" type="application/x-wiki" title="edit LegacyAppDocConcept" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppDocConcept?t=1504184943" type="application/x-wiki" title="edit LegacyAppDocConcept" />
 	<meta name="description" content="LegacyAppDocConcept" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -23,6 +23,21 @@ pre {
 </style>
 <![endif]-->
 
+<meta name="foswiki.PUBURL" content="http://wiki.gnumed.de/pub" /> <!-- PUBURL -->
+<meta name="foswiki.PUBURLPATH" content="/pub" /> <!-- PUBURLPATH -->
+<meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
+<meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
+<meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
+<meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
+<meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
+<meta name="foswiki.TOPIC" content="LegacyAppDocConcept" /> <!-- TOPIC -->
+<meta name="foswiki.USERNAME" content="KarstenHilbert" /> <!-- USERNAME -->
+<meta name="foswiki.USERSWEB" content="Main" /> <!-- USERSWEB -->
+<meta name="foswiki.WEB" content="Gnumed" /> <!-- WEB -->
+<meta name="foswiki.WIKINAME" content="KarstenHilbert" /> <!-- WIKINAME -->
+<meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
+<meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <style type="text/css" media="all">
 .foswikiTable#tablePublishManual22 td {vertical-align:middle; vertical-align:top}
 .foswikiTable#tablePublishManual22 td.foswikiTableCol0 {text-align:left}
@@ -89,21 +104,6 @@ pre {
 .foswikiTable#tablePublishManual8 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 .foswikiTable#tablePublishManual8 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
 </style><!--TABLEPLUGIN_specific: requires= missing ids: TABLEPLUGIN_default-->
-<meta name="foswiki.PUBURL" content="http://wiki.gnumed.de/pub" /> <!-- PUBURL -->
-<meta name="foswiki.PUBURLPATH" content="/pub" /> <!-- PUBURLPATH -->
-<meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
-<meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
-<meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
-<meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
-<meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
-<meta name="foswiki.TOPIC" content="LegacyAppDocConcept" /> <!-- TOPIC -->
-<meta name="foswiki.USERNAME" content="KarstenHilbert" /> <!-- USERNAME -->
-<meta name="foswiki.USERSWEB" content="Main" /> <!-- USERSWEB -->
-<meta name="foswiki.WEB" content="Gnumed" /> <!-- WEB -->
-<meta name="foswiki.WIKINAME" content="KarstenHilbert" /> <!-- WIKINAME -->
-<meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
-<meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
@@ -175,13 +175,13 @@ Um GNUmed von DocConcept aus aufzurufen, gehen Sie wie folgt vor:
 <table border="1" class="foswikiTable" id="tablePublishManual23" rules="none" summary="Topic-Anh�nge"><caption>Topic-Anh�nge</caption>
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
-			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
-			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=4;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
-			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=5;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
-			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=6;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
+			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
+			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=4;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
+			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=5;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
+			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=6;table=23;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/LegacyAppTerminiko.html b/client/doc/user-manual/Gnumed/LegacyAppTerminiko.html
index 4409b62..5466a92 100644
--- a/client/doc/user-manual/Gnumed/LegacyAppTerminiko.html
+++ b/client/doc/user-manual/Gnumed/LegacyAppTerminiko.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppTerminiko?t=1448132847" type="application/x-wiki" title="edit LegacyAppTerminiko" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LegacyAppTerminiko?t=1504184943" type="application/x-wiki" title="edit LegacyAppTerminiko" />
 	<meta name="description" content="LegacyAppTerminiko" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -23,21 +23,6 @@ pre {
 </style>
 <![endif]-->
 
-<meta name="foswiki.PUBURL" content="http://wiki.gnumed.de/pub" /> <!-- PUBURL -->
-<meta name="foswiki.PUBURLPATH" content="/pub" /> <!-- PUBURLPATH -->
-<meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
-<meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
-<meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
-<meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
-<meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
-<meta name="foswiki.TOPIC" content="LegacyAppTerminiko" /> <!-- TOPIC -->
-<meta name="foswiki.USERNAME" content="KarstenHilbert" /> <!-- USERNAME -->
-<meta name="foswiki.USERSWEB" content="Main" /> <!-- USERSWEB -->
-<meta name="foswiki.WEB" content="Gnumed" /> <!-- WEB -->
-<meta name="foswiki.WIKINAME" content="KarstenHilbert" /> <!-- WIKINAME -->
-<meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
-<meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <style type="text/css" media="all">
 .foswikiTable#tablePublishManual22 td {vertical-align:middle; vertical-align:top}
 .foswikiTable#tablePublishManual22 td.foswikiTableCol0 {text-align:left}
@@ -120,9 +105,24 @@ pre {
 .foswikiTable#tablePublishManual8 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 .foswikiTable#tablePublishManual8 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
 </style><!--TABLEPLUGIN_specific: requires= missing ids: TABLEPLUGIN_default-->
+<meta name="foswiki.PUBURL" content="http://wiki.gnumed.de/pub" /> <!-- PUBURL -->
+<meta name="foswiki.PUBURLPATH" content="/pub" /> <!-- PUBURLPATH -->
+<meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
+<meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
+<meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
+<meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
+<meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
+<meta name="foswiki.TOPIC" content="LegacyAppTerminiko" /> <!-- TOPIC -->
+<meta name="foswiki.USERNAME" content="KarstenHilbert" /> <!-- USERNAME -->
+<meta name="foswiki.USERSWEB" content="Main" /> <!-- USERSWEB -->
+<meta name="foswiki.WEB" content="Gnumed" /> <!-- WEB -->
+<meta name="foswiki.WIKINAME" content="KarstenHilbert" /> <!-- WIKINAME -->
+<meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
+<meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
@@ -210,13 +210,13 @@ Wenn Sie die Schritte 2) und 3) von GNUmed automatisch erledigen lassen wollen,
 <table border="1" class="foswikiTable" id="tablePublishManual24" rules="none" summary="Topic-Anh�nge"><caption>Topic-Anh�nge</caption>
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
-			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
-			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=3;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
-			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=4;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
-			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=5;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
-			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=6;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">I</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Anhang</a> </th>
+			<th class="foswikiTableCol2"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Aktion</a> </th>
+			<th class="foswikiTableCol3"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=3;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Gr��e</a> </th>
+			<th class="foswikiTableCol4"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=4;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Datum</a> </th>
+			<th class="foswikiTableCol5"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=5;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Wer</a> </th>
+			<th class="foswikiTableCol6 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=6;table=24;up=0#sorted_table" rel="nofollow" title="Sort by this column">Kommentar</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/LicensingStatus.html b/client/doc/user-manual/Gnumed/LicensingStatus.html
index e2909ca..c482a57 100644
--- a/client/doc/user-manual/Gnumed/LicensingStatus.html
+++ b/client/doc/user-manual/Gnumed/LicensingStatus.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LicensingStatus?t=1448132847" type="application/x-wiki" title="edit LicensingStatus" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/LicensingStatus?t=1504184943" type="application/x-wiki" title="edit LicensingStatus" />
 	<meta name="description" content="LicensingStatus" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="LicensingStatus" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/MenuReference.html b/client/doc/user-manual/Gnumed/MenuReference.html
index dd2d1a0..f2734aa 100644
--- a/client/doc/user-manual/Gnumed/MenuReference.html
+++ b/client/doc/user-manual/Gnumed/MenuReference.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/MenuReference?t=1448132847" type="application/x-wiki" title="edit MenuReference" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/MenuReference?t=1504184943" type="application/x-wiki" title="edit MenuReference" />
 	<meta name="description" content="MenuReference" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="MenuReference" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/PaperToEmr.html b/client/doc/user-manual/Gnumed/PaperToEmr.html
index daa18e6..d82d498 100644
--- a/client/doc/user-manual/Gnumed/PaperToEmr.html
+++ b/client/doc/user-manual/Gnumed/PaperToEmr.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/PaperToEmr?t=1448132847" type="application/x-wiki" title="edit PaperToEmr" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/PaperToEmr?t=1504184943" type="application/x-wiki" title="edit PaperToEmr" />
 	<meta name="description" content="PaperToEmr" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="PaperToEmr" /> <!-- TOPIC -->
@@ -76,9 +76,9 @@ Approaches for various sources of new paper are offered:
 <table border="1" class="foswikiTable" rules="none">
 	<thead>
 		<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
-			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=0;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">Source</a> </th>
-			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=1;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">Solutions</a> </th>
-			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=8264e3a4929681f912dabb9270961177;topic=Gnumed.PublishManual;ping=21%20Nov%202015%20-%2020:06;sortcol=2;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">See</a> </th>
+			<th class="foswikiTableCol0 foswikiFirstCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=0;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">Source</a> </th>
+			<th class="foswikiTableCol1"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=1;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">Solutions</a> </th>
+			<th class="foswikiTableCol2 foswikiLastCol"> <a href="/bin/rest/PublishPlugin/publish?validation_key=05095ce2a9c52ff1cbd43789dce3eec6;topic=Gnumed.PublishManual;ping=31%20Aug%202017%20-%2015:08;usernamestep=ncq;sortcol=2;table=25;up=0#sorted_table" rel="nofollow" title="Sort by this column">See</a> </th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/client/doc/user-manual/Gnumed/ReleaseStatus.html b/client/doc/user-manual/Gnumed/ReleaseStatus.html
index 3ea0dfb..62afc3c 100644
--- a/client/doc/user-manual/Gnumed/ReleaseStatus.html
+++ b/client/doc/user-manual/Gnumed/ReleaseStatus.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ReleaseStatus?t=1448132847" type="application/x-wiki" title="edit ReleaseStatus" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ReleaseStatus?t=1504184943" type="application/x-wiki" title="edit ReleaseStatus" />
 	<meta name="description" content="ReleaseStatus" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="ReleaseStatus" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/ServerInstallUpgrade.html b/client/doc/user-manual/Gnumed/ServerInstallUpgrade.html
index ee06827..ea32c69 100644
--- a/client/doc/user-manual/Gnumed/ServerInstallUpgrade.html
+++ b/client/doc/user-manual/Gnumed/ServerInstallUpgrade.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ServerInstallUpgrade?t=1448132847" type="application/x-wiki" title="edit ServerInstallUpgrade" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/ServerInstallUpgrade?t=1504184943" type="application/x-wiki" title="edit ServerInstallUpgrade" />
 	<meta name="description" content="ServerInstallUpgrade" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="ServerInstallUpgrade" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/doc/user-manual/Gnumed/TalkbackClient.html b/client/doc/user-manual/Gnumed/TalkbackClient.html
index 228836c..4bc924d 100644
--- a/client/doc/user-manual/Gnumed/TalkbackClient.html
+++ b/client/doc/user-manual/Gnumed/TalkbackClient.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/TalkbackClient?t=1448132847" type="application/x-wiki" title="edit TalkbackClient" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/TalkbackClient?t=1504184943" type="application/x-wiki" title="edit TalkbackClient" />
 	<meta name="description" content="TalkbackClient" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="TalkbackClient" /> <!-- TOPIC -->
diff --git a/client/doc/user-manual/Gnumed/UiDesignDecisions.html b/client/doc/user-manual/Gnumed/UiDesignDecisions.html
index f6af35e..d7297e8 100644
--- a/client/doc/user-manual/Gnumed/UiDesignDecisions.html
+++ b/client/doc/user-manual/Gnumed/UiDesignDecisions.html
@@ -5,7 +5,7 @@
 		  
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta name="robots" content="noindex" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss.html" />
 	<link rel="icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../rsrc/System/ProjectLogos/favicon.ico" type="image/x-icon" />
-	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/UiDesignDecisions?t=1448132847" type="application/x-wiki" title="edit UiDesignDecisions" />
+	<link rel="alternate" href="http://wiki.gnumed.de/bin/edit/Gnumed/UiDesignDecisions?t=1504184943" type="application/x-wiki" title="edit UiDesignDecisions" />
 	<meta name="description" content="UiDesignDecisions" />
 	 <!--[if IE]></base><![endif]-->
 	
@@ -28,7 +28,7 @@ pre {
 <meta name="foswiki.SCRIPTSUFFIX" content="" /> <!-- SCRIPTSUFFIX -->
 <meta name="foswiki.SCRIPTURL" content="http://wiki.gnumed.de/bin" /> <!-- SCRIPTURL -->
 <meta name="foswiki.SCRIPTURLPATH" content="/bin" /> <!-- SCRIPTURLPATH -->
-<meta name="foswiki.SERVERTIME" content="21%20Nov%202015%20-%2020:07" /> <!-- SERVERTIME -->
+<meta name="foswiki.SERVERTIME" content="31%20Aug%202017%20-%2015:09" /> <!-- SERVERTIME -->
 <meta name="foswiki.SKIN" content="twikinet%2c%20pattern" /> <!-- SKIN -->
 <meta name="foswiki.SYSTEMWEB" content="System" /> <!-- SYSTEMWEB -->
 <meta name="foswiki.TOPIC" content="UiDesignDecisions" /> <!-- TOPIC -->
@@ -39,8 +39,8 @@ pre {
 <meta name="foswiki.WIKIUSERNAME" content="Main.KarstenHilbert" /> <!-- WIKIUSERNAME -->
 <meta name="foswiki.NAMEFILTER" content="%5b%5cs%5c*%3f~%5e%5c%24%40%25%60%22'%26%3b%7c%3c%3e%5c%5b%5c%5d%23%5cx00-%5cx1f%5d" /> <!-- NAMEFILTER --><!--JQUERYPLUGIN::FOSWIKI::META-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/jquery-1.4.3.js'></script><!--JQUERYPLUGIN-->
-<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js'></script><!--JQUERYPLUGIN::LIVEQUERY-->
+<script type='text/javascript' src='../rsrc/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.js'></script><!--JQUERYPLUGIN::FOSWIKI-->
 <script type='text/javascript' src='../rsrc/System/JSTreeContrib/jquery.jstree.js'></script><!--JQUERYPLUGIN::JSTREE-->
 </head>
 <body class=""><div class="foswikiPage">
diff --git a/client/exporters/gmPatientExporter.py b/client/exporters/gmPatientExporter.py
index 0fedba0..fd41ca7 100644
--- a/client/exporters/gmPatientExporter.py
+++ b/client/exporters/gmPatientExporter.py
@@ -922,9 +922,9 @@ class cEMRJournalExporter:
 	#--------------------------------------------------------
 	# external API
 	#--------------------------------------------------------
-	def export_to_file_by_mod_time(self, filename=None, patient=None):
+	def save_to_file_by_mod_time(self, filename=None, patient=None):
 		if patient is None:
-			raise ValueError('[%s].export_to_file_by_mod_time(): no patient' % self.__class__.__name__)
+			raise ValueError('[%s].save_to_file_by_mod_time(): no patient' % self.__class__.__name__)
 
 		if filename is None:
 			filename = gmTools.get_unique_filename(prefix = 'gm-emr_by_mod_time-', suffix = '.txt')
@@ -990,14 +990,14 @@ class cEMRJournalExporter:
 		return filename
 
 	#--------------------------------------------------------
-	def export_to_file_by_encounter(self, filename=None, patient=None):
+	def save_to_file_by_encounter(self, filename=None, patient=None):
 		"""Export medical record into a file.
 
 		@type filename: None (creates filename by itself) or string
 		@type patient: <cPerson> instance
 		"""
 		if patient is None:
-			raise ValueError('[%s].export_to_file_by_encounter(): no patient' % self.__class__.__name__)
+			raise ValueError('[%s].save_to_file_by_encounter(): no patient' % self.__class__.__name__)
 
 		if filename is None:
 			filename = gmTools.get_unique_filename(prefix = 'gm-emr_journal-', suffix = '.txt')
@@ -1169,7 +1169,7 @@ class cMedistarSOAPExporter:
 	#--------------------------------------------------------
 	# external API
 	#--------------------------------------------------------
-	def export_to_file(self, filename=None, encounter=None, soap_cats=u'soapu', export_to_import_file=False):
+	def save_to_file(self, filename=None, encounter=None, soap_cats=u'soapu', export_to_import_file=False):
 		if not self.__pat.connected:
 			return (False, 'no active patient')
 
@@ -1257,7 +1257,7 @@ def run():
             break
         # FIXME: needed ?
         exporter = cEMRJournalExporter()
-        exporter.export_to_file(patient=patient)
+        exporter.save_to_file(patient=patient)
 #        export_tool.set_patient(patient)
         # Dump patient EMR sections
 #        export_tool.dump_constraints()
@@ -1292,7 +1292,7 @@ if __name__ == "__main__":
 				break
 
 			exporter = cEMRJournalExporter()
-			print "exported into file:", exporter.export_to_file_by_encounter(patient = patient)
+			print "exported into file:", exporter.save_to_file_by_encounter(patient = patient)
 
 			if patient is not None:
 				try:
@@ -1308,7 +1308,7 @@ if __name__ == "__main__":
 			return
 
 		exporter = cEMRJournalExporter()
-		print "exported into file:", exporter.export_to_file_by_mod_time(patient = patient)
+		print "exported into file:", exporter.save_to_file_by_mod_time(patient = patient)
 	#--------------------------------------------------------
 	print "\n\nGNUmed ASCII EMR Export"
 	print     "======================="
diff --git a/client/gnumed.py b/client/gnumed.py
index 7117b13..70e3c7b 100644
--- a/client/gnumed.py
+++ b/client/gnumed.py
@@ -91,7 +91,7 @@ against. Please run GNUmed as a non-root user.
 	sys.exit(1)
 
 #----------------------------------------------------------
-current_client_version = u'1.6.13'
+current_client_version = u'1.6.14'
 current_client_branch = u'1.6'
 
 _log = None
diff --git a/client/po/ar-gnumed.mo b/client/po/ar-gnumed.mo
index b73d875..6863740 100644
Binary files a/client/po/ar-gnumed.mo and b/client/po/ar-gnumed.mo differ
diff --git a/client/po/bg-gnumed.mo b/client/po/bg-gnumed.mo
index 67e01d0..a0b5ff4 100644
Binary files a/client/po/bg-gnumed.mo and b/client/po/bg-gnumed.mo differ
diff --git a/client/po/ca-gnumed.mo b/client/po/ca-gnumed.mo
index 81c88ef..eb9faa8 100644
Binary files a/client/po/ca-gnumed.mo and b/client/po/ca-gnumed.mo differ
diff --git a/client/po/cs-gnumed.mo b/client/po/cs-gnumed.mo
index 274d32b..0b980c5 100644
Binary files a/client/po/cs-gnumed.mo and b/client/po/cs-gnumed.mo differ
diff --git a/client/po/da-gnumed.mo b/client/po/da-gnumed.mo
index f30f1b0..72787ea 100644
Binary files a/client/po/da-gnumed.mo and b/client/po/da-gnumed.mo differ
diff --git a/client/po/de-gnumed.mo b/client/po/de-gnumed.mo
index b74352b..423ea3a 100644
Binary files a/client/po/de-gnumed.mo and b/client/po/de-gnumed.mo differ
diff --git a/client/po/el-gnumed.mo b/client/po/el-gnumed.mo
index d7acaf4..5c62585 100644
Binary files a/client/po/el-gnumed.mo and b/client/po/el-gnumed.mo differ
diff --git a/client/po/en_AU-gnumed.mo b/client/po/en_AU-gnumed.mo
index 9ad1e71..0cf31df 100644
Binary files a/client/po/en_AU-gnumed.mo and b/client/po/en_AU-gnumed.mo differ
diff --git a/client/po/en_CA-gnumed.mo b/client/po/en_CA-gnumed.mo
index 845964a..0e87a7a 100644
Binary files a/client/po/en_CA-gnumed.mo and b/client/po/en_CA-gnumed.mo differ
diff --git a/client/po/es-gnumed.mo b/client/po/es-gnumed.mo
index 29ffee1..be02377 100644
Binary files a/client/po/es-gnumed.mo and b/client/po/es-gnumed.mo differ
diff --git a/client/po/fr-gnumed.mo b/client/po/fr-gnumed.mo
index 3273f88..17ab863 100644
Binary files a/client/po/fr-gnumed.mo and b/client/po/fr-gnumed.mo differ
diff --git a/client/po/id-gnumed.mo b/client/po/id-gnumed.mo
index 79aee5f..28dd096 100644
Binary files a/client/po/id-gnumed.mo and b/client/po/id-gnumed.mo differ
diff --git a/client/po/it-gnumed.mo b/client/po/it-gnumed.mo
index a89584c..48fe2df 100644
Binary files a/client/po/it-gnumed.mo and b/client/po/it-gnumed.mo differ
diff --git a/client/po/ka-gnumed.mo b/client/po/ka-gnumed.mo
index 071f74f..bf65e41 100644
Binary files a/client/po/ka-gnumed.mo and b/client/po/ka-gnumed.mo differ
diff --git a/client/po/nb-gnumed.mo b/client/po/nb-gnumed.mo
index bbf6e61..283351e 100644
Binary files a/client/po/nb-gnumed.mo and b/client/po/nb-gnumed.mo differ
diff --git a/client/po/nl-gnumed.mo b/client/po/nl-gnumed.mo
index 8e9920c..f4534fa 100644
Binary files a/client/po/nl-gnumed.mo and b/client/po/nl-gnumed.mo differ
diff --git a/client/po/pl-gnumed.mo b/client/po/pl-gnumed.mo
index 29af396..a7b2b22 100644
Binary files a/client/po/pl-gnumed.mo and b/client/po/pl-gnumed.mo differ
diff --git a/client/po/pt-gnumed.mo b/client/po/pt-gnumed.mo
index 1929355..bb32dbb 100644
Binary files a/client/po/pt-gnumed.mo and b/client/po/pt-gnumed.mo differ
diff --git a/client/po/pt_BR-gnumed.mo b/client/po/pt_BR-gnumed.mo
index f7b1bd4..efc2aed 100644
Binary files a/client/po/pt_BR-gnumed.mo and b/client/po/pt_BR-gnumed.mo differ
diff --git a/client/po/ro-gnumed.mo b/client/po/ro-gnumed.mo
index c666289..e004072 100644
Binary files a/client/po/ro-gnumed.mo and b/client/po/ro-gnumed.mo differ
diff --git a/client/po/ru-gnumed.mo b/client/po/ru-gnumed.mo
index b0ab387..21049f7 100644
Binary files a/client/po/ru-gnumed.mo and b/client/po/ru-gnumed.mo differ
diff --git a/client/po/ru_RU-gnumed.mo b/client/po/ru_RU-gnumed.mo
index 2770ff8..e7d29f4 100644
Binary files a/client/po/ru_RU-gnumed.mo and b/client/po/ru_RU-gnumed.mo differ
diff --git a/client/po/sq-gnumed.mo b/client/po/sq-gnumed.mo
index bcf7e17..00136a3 100644
Binary files a/client/po/sq-gnumed.mo and b/client/po/sq-gnumed.mo differ
diff --git a/client/po/sr-gnumed.mo b/client/po/sr-gnumed.mo
index 75980a3..3590c9a 100644
Binary files a/client/po/sr-gnumed.mo and b/client/po/sr-gnumed.mo differ
diff --git a/client/po/sv-gnumed.mo b/client/po/sv-gnumed.mo
index da11ec0..cbec864 100644
Binary files a/client/po/sv-gnumed.mo and b/client/po/sv-gnumed.mo differ
diff --git a/client/po/tr-gnumed.mo b/client/po/tr-gnumed.mo
index 3d42a82..886a555 100644
Binary files a/client/po/tr-gnumed.mo and b/client/po/tr-gnumed.mo differ
diff --git a/client/po/uk-gnumed.mo b/client/po/uk-gnumed.mo
index 03c8db9..5e60405 100644
Binary files a/client/po/uk-gnumed.mo and b/client/po/uk-gnumed.mo differ
diff --git a/client/po/zh_TW-gnumed.mo b/client/po/zh_TW-gnumed.mo
index da53d80..555fb96 100644
Binary files a/client/po/zh_TW-gnumed.mo and b/client/po/zh_TW-gnumed.mo differ
diff --git a/client/pycommon/gmPG2.py b/client/pycommon/gmPG2.py
index 4eb2bd6..36d2f87 100644
--- a/client/pycommon/gmPG2.py
+++ b/client/pycommon/gmPG2.py
@@ -35,7 +35,7 @@ from Gnumed.pycommon import gmDateTime
 from Gnumed.pycommon import gmBorg
 from Gnumed.pycommon import gmI18N
 from Gnumed.pycommon import gmLog2
-from Gnumed.pycommon.gmTools import prompted_input, u_replacement_character
+from Gnumed.pycommon.gmTools import prompted_input, u_replacement_character, format_dict_like
 
 _log = logging.getLogger('gm.db')
 
@@ -169,6 +169,30 @@ map_client_branch2required_db_version = {
 	u'1.6': 21
 }
 
+map_psyco_tx_status2str = [
+	u'TRANSACTION_STATUS_IDLE',
+	u'TRANSACTION_STATUS_ACTIVE',
+	u'TRANSACTION_STATUS_INTRANS',
+	u'TRANSACTION_STATUS_INERROR',
+	u'TRANSACTION_STATUS_UNKNOWN'
+]
+
+map_psyco_conn_status2str = [
+	u'0 - ?',
+	u'STATUS_READY',
+	u'STATUS_BEGIN_ALIAS_IN_TRANSACTION',
+	u'STATUS_PREPARED'
+]
+
+map_psyco_iso_level2str = {
+	None: u'ISOLATION_LEVEL_DEFAULT (configured on server)',
+	0: u'ISOLATION_LEVEL_AUTOCOMMIT',
+	1: u'ISOLATION_LEVEL_READ_UNCOMMITTED',
+	2: u'ISOLATION_LEVEL_REPEATABLE_READ',
+	3: u'ISOLATION_LEVEL_SERIALIZABLE',
+	4: u'ISOLATION_LEVEL_READ_UNCOMMITTED'
+}
+
 # get columns and data types for a given table
 query_table_col_defs = u"""select
 	cols.column_name,
@@ -442,6 +466,7 @@ def __request_login_params_tui():
 		raise gmExceptions.ConnectionError(_("Cannot connect to database without login information!"))
 
 	return login
+
 #---------------------------------------------------
 def __request_login_params_gui_wx():
 	"""GUI (wx) input request for database login parameters.
@@ -511,6 +536,7 @@ def make_psycopg2_dsn(database=None, host=None, port=5432, user=None, password=N
 		dsn_parts.append('password=%s' % password)
 
 	dsn_parts.append('sslmode=prefer')
+	dsn_parts.append('fallback_application_name=GNUmed')
 
 	return ' '.join(dsn_parts)
 
@@ -878,10 +904,13 @@ def delete_translation_from_database(link_obj=None, language=None, original=None
 	return True
 
 #------------------------------------------------------------------------
-def update_translation_in_database(language=None, original=None, translation=None):
-	cmd = u'SELECT i18n.upd_tx(%(lang)s, %(orig)s, %(trans)s)'
+def update_translation_in_database(language=None, original=None, translation=None, link_obj=None):
+	if language is None:
+		cmd = u'SELECT i18n.upd_tx(%(orig)s, %(trans)s)'
+	else:
+		cmd = u'SELECT i18n.upd_tx(%(lang)s, %(orig)s, %(trans)s)'
 	args = {'lang': language, 'orig': original, 'trans': translation}
-	run_rw_queries(queries = [{'cmd': cmd, 'args': args}], return_data = False)
+	run_rw_queries(queries = [{'cmd': cmd, 'args': args}], return_data = False, link_obj = link_obj)
 	return args
 
 #------------------------------------------------------------------------
@@ -1022,10 +1051,12 @@ def force_user_language(language=None):
 def send_maintenance_notification():
 	cmd = u'notify "db_maintenance_warning"'
 	run_rw_queries(queries = [{'cmd': cmd}], return_data = False)
+
 #------------------------------------------------------------------------
 def send_maintenance_shutdown():
 	cmd = u'notify "db_maintenance_disconnect"'
 	run_rw_queries(queries = [{'cmd': cmd}], return_data = False)
+
 #------------------------------------------------------------------------
 def is_pg_interval(candidate=None):
 	cmd = u'SELECT %(candidate)s::interval'
@@ -1161,15 +1192,6 @@ def bytea2file_object(data_query=None, file_obj=None, chunk_size=0, data_size=No
 	needed_chunks, remainder = divmod(data_size, chunk_size)
 	_log.debug('# of chunks: %s; remainder: %s bytes', needed_chunks, remainder)
 
-#	# since we now require PG 9.1 we can disable this workaround:
-#	# try setting "bytea_output"
-#	# - fails if not necessary
-#	# - succeeds if necessary
-#	try:
-#		run_ro_queries(link_obj = conn, queries = [{'cmd': u"set bytea_output to 'escape'"}])
-#	except dbapi.ProgrammingError:
-#		_log.debug('failed to set bytea_output to "escape", not necessary')
-
 	# retrieve chunks, skipped if data size < chunk size,
 	# does this not carry the danger of cutting up multi-byte escape sequences ?
 	# no, since bytea is binary,
@@ -1468,6 +1490,27 @@ def file2bytea_overlay(query=None, args=None, filename=None, conn=None, md5_quer
 	_log.error('MD5 sums of data file and database BYTEA field do not match: [file::%s] <> [DB::%s]', file_md5, db_md5)
 	return False
 
+#---------------------------------------------------------------------------
+def run_sql_script(sql_script, conn=None):
+
+	if conn is None:
+		conn = get_connection(readonly = False)
+
+	from Gnumed.pycommon import gmPsql
+	psql = gmPsql.Psql(conn)
+
+	if psql.run(sql_script) == 0:
+		query = {
+			'cmd': u'select gm.log_script_insertion(%(name)s, %(ver)s)',
+			'args': {'name': sql_script, 'ver': u'current'}
+		}
+		run_rw_queries(link_obj = conn, queries = [query])
+		conn.commit()
+		return True
+
+	_log.error('error running sql script: %s', sql_script)
+	return False
+
 #------------------------------------------------------------------------
 def sanitize_pg_regex(expression=None, escape_all=False):
 	"""Escape input for use in a PostgreSQL regular expression.
@@ -1496,6 +1539,56 @@ def sanitize_pg_regex(expression=None, escape_all=False):
 		#']', '\]',			# not needed
 
 #------------------------------------------------------------------------
+def capture_conn_state(conn=None):
+
+	tx_status = conn.get_transaction_status()
+	if tx_status in [ psycopg2.extensions.TRANSACTION_STATUS_INERROR, psycopg2.extensions.TRANSACTION_STATUS_UNKNOWN ]:
+		isolation_level = u'%s (tx aborted or unknown, cannot retrieve)' % conn.isolation_level
+	else:
+		isolation_level = u'%s (%s)' % (conn.isolation_level, map_psyco_iso_level2str[conn.isolation_level])
+	conn_status = u'%s (%s)' % (conn.status, map_psyco_conn_status2str[conn.status])
+	if conn.closed != 0:
+		conn_status = u'undefined (%s)' % conn_status
+
+	d = {
+		u'identity': id(conn),
+		u'backend PID': conn.get_backend_pid(),
+		u'protocol version': conn.protocol_version,
+		u'encoding': conn.encoding,
+		u'closed': conn.closed,
+		u'readonly': conn.readonly,
+		u'autocommit': conn.autocommit,
+		u'isolation level (psyco)': isolation_level,
+		u'async': conn.async,
+		u'deferrable': conn.deferrable,
+		u'transaction status': u'%s (%s)' % (tx_status, map_psyco_tx_status2str[tx_status]),
+		u'connection status': conn_status,
+		u'executing async op': conn.isexecuting(),
+		u'type': type(conn)
+	}
+	return u'%s\n' % conn + format_dict_like (
+		d,
+		relevant_keys = [
+			u'type',
+			u'identity',
+			u'backend PID',
+			u'protocol version',
+			u'encoding',
+			u'isolation level (psyco)',
+			u'readonly',
+			u'autocommit',
+			u'closed',
+			u'connection status',
+			u'transaction status',
+			u'deferrable',
+			u'async',
+			u'executing async op'
+		],
+		tabular = True,
+		value_delimiters = None
+	)
+
+#------------------------------------------------------------------------
 def capture_cursor_state(cursor=None):
 	conn = cursor.connection
 
@@ -1505,6 +1598,11 @@ def capture_cursor_state(cursor=None):
 	else:
 		isolation_level = conn.isolation_level
 
+	if cursor.query is None:
+		query = u'<no query>'
+	else:
+		query = unicode(cursor.query, 'utf8', 'replace')
+
 	txt = u"""Link state:
 Cursor
   identity: %s; name: %s
@@ -1514,7 +1612,7 @@ Cursor
   statusmessage: %s
 Connection
   identity: %s; backend pid: %s; protocol version: %s;
-  closed: %s; autocommit: %s; isolation level: %s; encoding: %s; async: %s;
+  closed: %s; autocommit: %s; isolation level: %s; encoding: %s; async: %s; deferrable: %s; readonly: %s;
   TX status: %s; CX status: %s; executing async op: %s;
 Query
   %s
@@ -1540,11 +1638,13 @@ Query
 		isolation_level,
 		conn.encoding,
 		conn.async,
-		tx_status,
-		conn.status,
+		conn.deferrable,
+		conn.readonly,
+		map_psyco_tx_status2str[tx_status],
+		map_psyco_conn_status2str[conn.status],
 		conn.isexecuting(),
 
-		unicode(cursor.query, 'utf8', 'replace'),
+		query
 	)
 	return txt
 
@@ -1602,6 +1702,14 @@ def run_ro_queries(link_obj=None, queries=None, verbose=False, return_data=True,
 		except dbapi.Error as pg_exc:
 			_log.error('query failed in RO connection')
 			_log.error(capture_cursor_state(curs))
+			if hasattr(pg_exc, 'diag'):
+				for prop in dir(pg_exc.diag):
+					if prop.startswith(u'__'):
+						continue
+					val = getattr(pg_exc.diag, prop)
+					if val is None:
+						continue
+					_log.error(u'PG diags %s: %s', prop, val)
 			pg_exc = make_pg_exception_fields_unicode(pg_exc)
 			_log.error('PG error code: %s', pg_exc.pgcode)
 			if pg_exc.pgerror is not None:
@@ -1650,6 +1758,9 @@ def run_ro_queries(link_obj=None, queries=None, verbose=False, return_data=True,
 			col_idx = get_col_indices(curs)
 
 	curs_close()
+	# so we can see data committed meanwhile if the
+	# link object had been passed in and thusly might
+	# be part of a long-running read-only transaction
 	readonly_rollback_just_in_case()
 	return (data, col_idx)
 
@@ -1748,6 +1859,14 @@ def run_rw_queries(link_obj=None, queries=None, end_tx=False, return_data=None,
 		except dbapi.Error as pg_exc:
 			_log.error('query failed in RW connection')
 			_log.error(capture_cursor_state(curs))
+			if hasattr(pg_exc, 'diag'):
+				for prop in dir(pg_exc.diag):
+					if prop.startswith(u'__'):
+						continue
+					val = getattr(pg_exc.diag, prop)
+					if val is None:
+						continue
+					_log.error(u'PG diags %s: %s', prop, val)
 			for notice in notices_accessor.notices:
 				_log.error(notice.strip(u'\n').strip(u'\r'))
 			del notices_accessor.notices[:]
@@ -1906,7 +2025,7 @@ class cConnectionPool(psycopg2.pool.PersistentConnectionPool):
 			self._used[conn_key].original_close()
 
 # -----------------------------------------------------------------------
-def get_raw_connection(dsn=None, verbose=False, readonly=True):
+def get_raw_connection(dsn=None, verbose=False, readonly=True, connection_name=None, autocommit=False):
 	"""Get a raw, unadorned connection.
 
 	- this will not set any parameters such as encoding, timezone, datestyle
@@ -1921,9 +2040,21 @@ def get_raw_connection(dsn=None, verbose=False, readonly=True):
 	if u'host=salaam.homeunix' in dsn:
 		raise ValueError('The public database is not hosted by <salaam.homeunix.com> anymore.\n\nPlease point your configuration files to <publicdb.gnumed.de>.')
 
+	# try to enforce a useful encoding early on so that we
+	# have a good chance of decoding authentication errors
+	# containing foreign language characters
+	if u' client_encoding=' not in dsn:
+		dsn += u' client_encoding=utf8'
+
+	if connection_name is None:
+		if u' application_name' not in dsn:
+			dsn += u" application_name=GNUmed"
+	else:
+		if u' application_name' not in dsn:
+			dsn += u" application_name=%s" % connection_name
+
 	try:
 		conn = dbapi.connect(dsn=dsn, connection_factory=psycopg2.extras.DictConnection)
-		#conn = dbapi.connect(dsn=dsn, cursor_factory=psycopg2.extras.RealDictCursor)
 	except dbapi.OperationalError, e:
 
 		t, v, tb = sys.exc_info()
@@ -1932,22 +2063,27 @@ def get_raw_connection(dsn=None, verbose=False, readonly=True):
 		except (AttributeError, IndexError, TypeError):
 			raise
 
-		msg = unicode(msg, gmI18N.get_encoding(), 'replace')
+		#msg = unicode(msg, gmI18N.get_encoding(), 'replace')
+		msg = unicode(msg, u'utf8', 'replace')
 
-		if msg.find('fe_sendauth') != -1:
+		if u'fe_sendauth' in msg:
 			raise cAuthenticationError, (dsn, msg), tb
 
 		if regex.search('user ".*" does not exist', msg) is not None:
 			raise cAuthenticationError, (dsn, msg), tb
 
-		if msg.find('uthenti') != -1:
+		if u'uthenti' in msg:
 			raise cAuthenticationError, (dsn, msg), tb
 
 		raise
 
-	_log.debug('new database connection, backend PID: %s, readonly: %s', conn.get_backend_pid(), readonly)
+	if connection_name is None:
+		_log.debug('established anonymous database connection, backend PID: %s', conn.get_backend_pid())
+	else:
+		_log.debug('established database connection "%s", backend PID: %s', connection_name, conn.get_backend_pid())
 
-	# do first-time stuff
+	# do first-connection-only stuff
+	# - verify PG version
 	global postgresql_version
 	if postgresql_version is None:
 		curs = conn.cursor()
@@ -1967,44 +2103,30 @@ def get_raw_connection(dsn=None, verbose=False, readonly=True):
 		except:
 			pass
 		if verbose:
-			_log_PG_settings(curs=curs)
+			_log_PG_settings(curs = curs)
 		curs.close()
 		conn.commit()
 
+	# - verify PG understands client time zone
 	if _default_client_timezone is None:
 		__detect_client_timezone(conn = conn)
 
-	curs = conn.cursor()
-
-	# set access mode
-	conn.set_session(readonly = readonly)
-	conn.set_session(autocommit = readonly)
-	if readonly:
-		_log.debug('access mode [READ ONLY]')
-		#conn.set_session(readonly = True)
-		_log.debug('readonly: autocommit=True to avoid <IDLE IN TRANSACTION>')
-#		conn.autocommit = True
-#		cmd = 'set session characteristics as transaction READ ONLY'
-#		curs.execute(cmd)
-#		cmd = 'set default_transaction_read_only to on'
-#		curs.execute(cmd)
+	# - set access mode
+	if readonly is True:
+		_log.debug('readonly: forcing autocommit=True to avoid <IDLE IN TRANSACTION>')
+		autocommit = True
 	else:
-		_log.debug('access mode [READ WRITE]')
-#		conn.set_session(readonly = False)
-		_log.debug('readwrite: autocommit=False')
-#		cmd = 'set session characteristics as transaction READ WRITE'
-#		curs.execute(cmd)
-#		cmd = 'set default_transaction_read_only to off'
-#		curs.execute(cmd)
-
-	curs.close()
+		_log.debug('autocommit is desired to be: %s', autocommit)
 	conn.commit()
+	conn.autocommit = autocommit
+	conn.readonly = readonly
 
 	conn.is_decorated = False
 
 	return conn
+
 # =======================================================================
-def get_connection(dsn=None, readonly=True, encoding=None, verbose=False, pooled=True):
+def get_connection(dsn=None, readonly=True, encoding=None, verbose=False, pooled=True, connection_name=None, autocommit=False):
 	"""Get a new connection.
 
 	This assumes the locale system has been initialized
@@ -2015,15 +2137,20 @@ def get_connection(dsn=None, readonly=True, encoding=None, verbose=False, pooled
 	if pooled and readonly and (dsn is None):
 		global __ro_conn_pool
 		if __ro_conn_pool is None:
+			log_ro_conn = True
 			__ro_conn_pool = cConnectionPool (
 				minconn = 1,
 				maxconn = 2,
 				dsn = dsn,
 				verbose = verbose
 			)
+		else:
+			log_ro_conn = False
 		conn = __ro_conn_pool.getconn()
+		if log_ro_conn:
+			[ _log.debug(line) for line in capture_conn_state(conn = conn).split(u'\n') ]
 	else:
-		conn = get_raw_connection(dsn=dsn, verbose=verbose, readonly=False)
+		conn = get_raw_connection(dsn = dsn, verbose = verbose, readonly = readonly, connection_name = connection_name, autocommit = autocommit)
 
 	if conn.is_decorated:
 		return conn
@@ -2048,57 +2175,42 @@ def get_connection(dsn=None, readonly=True, encoding=None, verbose=False, pooled
 
 	# - transaction isolation level
 	if readonly:
-		# alter-database default, checked at connect, no need to set now
-		iso_level = u'read committed'
+		# alter-database default, checked at connect, no need to set here
+		pass
 	else:
 		conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE)
-		iso_level = u'serializable'
-
-	_log.debug('client string encoding [%s], isolation level [%s], time zone [%s]', encoding, iso_level, _default_client_timezone)
 
-	curs = conn.cursor()
+	_log.debug('client time zone [%s]', _default_client_timezone)
 
 	# - client time zone
+	curs = conn.cursor()
 	curs.execute(_sql_set_timezone, [_default_client_timezone])
-
-	conn.commit()
-
-#	# FIXME: remove this whole affair once either 9.0 is standard (Ubuntu 10 LTS is
-#	# FIXME: PG 8.4, however!) or else when psycopg2 supports a workaround
-#	#
-#	# - bytea data format
-#	# PG 9.0 switched to - by default - using "hex" rather than "escape",
-#	# however, psycopg2's linked with a pre-9.0 libpq do assume "escape"
-#	# as the transmission mode for bytea output,
-#	# so try to set this setting back to "escape",
-#	# if that's not possible the reason will be that PG < 9.0 does not support
-#	# that setting - which also means we don't need it and can ignore the
-#	# failure
-#	cmd = "set bytea_output to 'escape'"
-#	try:
-#		curs.execute(cmd)
-#	except dbapi.ProgrammingError:
-#		_log.error('cannot set bytea_output format')
-
 	curs.close()
 	conn.commit()
 
 	conn.is_decorated = True
 
+	if verbose:
+		[ _log.debug(line) for line in capture_conn_state(conn = conn).split(u'\n') ]
+
 	return conn
+
 #-----------------------------------------------------------------------
 def shutdown():
 	if __ro_conn_pool is None:
 		return
 	__ro_conn_pool.shutdown()
+
 # ======================================================================
 # internal helpers
 #-----------------------------------------------------------------------
 def __noop():
 	pass
+
 #-----------------------------------------------------------------------
 def _raise_exception_on_ro_conn_close():
 	raise TypeError(u'close() called on read-only connection')
+
 #-----------------------------------------------------------------------
 def log_database_access(action=None):
 	run_insert (
@@ -2107,6 +2219,7 @@ def log_database_access(action=None):
 		values = {u'user_action': action},
 		end_tx = True
 	)
+
 #-----------------------------------------------------------------------
 def sanity_check_time_skew(tolerance=60):
 	"""Check server time and local time to be within
@@ -2150,6 +2263,7 @@ def sanity_check_time_skew(tolerance=60):
 		return False
 
 	return True
+
 #-----------------------------------------------------------------------
 def sanity_check_database_settings():
 	"""Checks database settings.
@@ -2237,22 +2351,43 @@ def sanity_check_database_settings():
 		return 1, u'\n'.join(msg)
 
 	return 0, u''
+
 #------------------------------------------------------------------------
 def _log_PG_settings(curs=None):
-	# don't use any of the run_*()s since that might
-	# create a loop if we fail here
-	# FIXME: use pg_settings
+	# don't use any of the run_*()s helper functions
+	# since that might create a loop if we fail here
 	try:
-		curs.execute(u'show all')
+		# .pending_restart does not exist in PG 9.4 yet
+		#curs.execute(u'SELECT name, setting, unit, source, reset_val, sourcefile, sourceline, pending_restart FROM pg_settings')
+		curs.execute(u'SELECT name, setting, unit, source, reset_val, sourcefile, sourceline FROM pg_settings')
 	except:
-		_log.exception(u'cannot log PG settings (>>>show all<<< failed)')
+		_log.exception(u'cannot log PG settings ("SELECT ... FROM pg_settings" failed)')
 		return False
 	settings = curs.fetchall()
-	if settings is None:
-		_log.error(u'cannot log PG settings (>>>show all<<< did not return rows)')
-		return False
 	for setting in settings:
-		_log.debug(u'PG option [%s]: %s', setting['name'], setting['setting'])
+		if setting['unit'] is None:
+			unit = u''
+		else:
+			unit = u' %s' % setting['unit']
+		if setting['sourcefile'] is None:
+			sfile = u''
+		else:
+			sfile = u'// %s @ %s' % (setting['sourcefile'], setting['sourceline'])
+#		# .pending_restart does not exist in PG 9.4 yet
+#		if setting['pending_restart'] is False:
+#			pending_restart = u''
+#		else:
+#			pending_restart = u'// needs restart'
+#		_log.debug(u'%s: %s%s (set from: [%s] // sess RESET will set to: [%s]%s%s)',
+		_log.debug(u'%s: %s%s (set from: [%s] // sess RESET will set to: [%s]%s)',
+			setting['name'],
+			setting['setting'],
+			unit,
+			setting['source'],
+			setting['reset_val'],
+#			pending_restart,
+			sfile
+		)
 
 	try:
 		curs.execute(u'select pg_available_extensions()')
@@ -2266,7 +2401,19 @@ def _log_PG_settings(curs=None):
 	for ext in extensions:
 		_log.debug(u'PG extension: %s', ext['pg_available_extensions'])
 
+	# not really that useful because:
+	# - clusterwide
+	# - not retained across server restart (fixed in 9.6.1 - really ?)
+#	try:
+#		curs.execute(u'SELECT pg_last_committed_xact()')
+#	except:
+#		_log.exception(u'cannot retrieve last committed xact')
+#	xact = curs.fetchall()
+#	if xact is not None:
+#		_log.debug(u'last committed transaction in cluster: %s', xact[0])
+
 	return True
+
 #========================================================================
 def make_pg_exception_fields_unicode(exc):
 
@@ -2286,6 +2433,7 @@ def make_pg_exception_fields_unicode(exc):
 	exc.u_pgerror = unicode(exc.pgerror, gmI18N.get_encoding(), 'replace').strip().strip(u'\n').strip().strip(u'\n')
 
 	return exc
+
 #------------------------------------------------------------------------
 def extract_msg_from_pg_exception(exc=None):
 
@@ -2296,6 +2444,7 @@ def extract_msg_from_pg_exception(exc=None):
 
 	# assumption
 	return unicode(msg, gmI18N.get_encoding(), 'replace')
+
 # =======================================================================
 class cAuthenticationError(dbapi.OperationalError):
 
@@ -2719,6 +2868,7 @@ if __name__ == "__main__":
 	#--------------------------------------------------------------------
 	def test_sanity_check_time_skew():
 		sanity_check_time_skew()
+
 	#--------------------------------------------------------------------
 	def test_get_foreign_key_names():
 		print get_foreign_key_names (
@@ -2729,6 +2879,7 @@ if __name__ == "__main__":
 			target_table = u'episode',
 			target_column = u'pk'
 		)
+
 	#--------------------------------------------------------------------
 	def test_get_foreign_key_details():
 		for row in get_foreign_keys2column (
@@ -2743,6 +2894,7 @@ if __name__ == "__main__":
 				row['referenced_table'],
 				row['referenced_column']
 			)
+
 	#--------------------------------------------------------------------
 	def test_set_user_language():
 		# (user, language, result, exception type)
@@ -2772,10 +2924,12 @@ if __name__ == "__main__":
 				print "test:", test
 				print "expected exception"
 				print "result:", e
+
 	#--------------------------------------------------------------------
 	def test_get_schema_revision_history():
 		for line in get_schema_revision_history():
 			print u' - '.join(line)
+
 	#--------------------------------------------------------------------
 	def test_run_query():
 		gmDateTime.init()
@@ -2856,6 +3010,11 @@ SELECT to_timestamp (foofoo,'YYMMDD.HH24MI') FROM (
 		run_rw_queries(queries = [{'cmd': u'SELEC 1'}])
 
 	#--------------------------------------------------------------------
+	def test_log_settings():
+		conn = conn = get_connection()
+		_log_PG_settings(curs = conn.cursor())
+
+	#--------------------------------------------------------------------
 	# run tests
 	#test_get_connection()
 	#test_exceptions()
@@ -2881,5 +3040,6 @@ SELECT to_timestamp (foofoo,'YYMMDD.HH24MI') FROM (
 	#test_file2bytea_copy_from()
 	#test_file2bytea_lo()
 	test_faulty_SQL()
+	#test_log_settings()
 
 # ======================================================================
diff --git a/client/pycommon/gmPsql.py b/client/pycommon/gmPsql.py
index 46df8c1..ad1b963 100644
--- a/client/pycommon/gmPsql.py
+++ b/client/pycommon/gmPsql.py
@@ -41,6 +41,7 @@ class Psql:
 		"""
 		self.conn = conn
 		self.vars = {'ON_ERROR_STOP':None}
+
 	#---------------------------------------------------------------
 	def match (self, str):
 		match = re.match (str, self.line)
@@ -50,6 +51,7 @@ class Psql:
 			ret = 1
 			self.groups = match.groups ()
 		return ret
+
 	#---------------------------------------------------------------
 	def fmt_msg(self, aMsg):
 		try:
@@ -65,6 +67,7 @@ class Psql:
 			except: pass
 			unformattable_error_id += 1
 		return tmp
+
 	#---------------------------------------------------------------
 	def run (self, filename):
 		"""
@@ -89,8 +92,8 @@ class Psql:
 		in_string = False
 		bracketlevel = 0
 		curr_cmd = ''
-		curs = self.conn.cursor ()
-##		transaction_started = False
+		curs = self.conn.cursor()
+
 		for self.line in self.file.readlines():
 			self.lineno += 1
 			if len(self.line.strip()) == 0:
@@ -100,20 +103,24 @@ class Psql:
 			if self.match (r"^\\echo (.*)"):
 				_log.info(self.fmt_msg(shell(self.groups[0])))
 				continue
+
 			# \qecho
 			if self.match (r"^\\qecho (.*)"):
 				_log.info(self.fmt_msg(shell (self.groups[0])))
 				continue
+
 			# \q
 			if self.match (r"^\\q"):
 				_log.warning(self.fmt_msg(u"script terminated by \\q"))
 				return 0
+
 			# \set
 			if self.match (r"^\\set (\S+) (\S+)"):
 				self.vars[self.groups[0]] = shell (self.groups[1])
 				if self.groups[0] == 'ON_ERROR_STOP':
 					self.vars['ON_ERROR_STOP'] = int (self.vars['ON_ERROR_STOP'])
 				continue
+
 			# \unset
 			if self.match (r"^\\unset (\S+)"):
 				self.vars[self.groups[0]] = None
@@ -150,46 +157,26 @@ class Psql:
 					curr_cmd += this_char
 				else:
 					try:
-#						if curr_cmd.strip ().upper () == 'COMMIT':
-#							if transaction_started:
-#								self.conn.commit ()
-#								curs.close ()
-#								curs = self.conn.cursor ()
-#								_log.debug(self.fmt_msg ("transaction committed"))
-#							else:
-#								_log.warning(self.fmt_msg ("COMMIT without BEGIN: no actual transaction happened!"))
-#							transaction_started = False
-
-#						elif curr_cmd.strip ().upper () == 'BEGIN':
-#							if transaction_started:
-#								_log.warning(self.fmt_msg ("BEGIN inside transaction"))
-#							else:
-#								transaction_started = True
-#								_log.debug(self.fmt_msg ("starting transaction"))
-
-#						else:
 						if curr_cmd.strip() != '':
-							if curr_cmd.find('vacuum'):
-								self.conn.commit();
-								curs.close()
-								old_iso_level = self.conn.isolation_level
-								self.conn.set_isolation_level(0)
-								curs = self.conn.cursor()
-								curs.execute (curr_cmd)
-								self.conn.set_isolation_level(old_iso_level)
-							else:
-								curs.execute (curr_cmd)
-#								if not transaction_started:
-					except Exception, error:
-						_log.debug(curr_cmd)
+							curs.execute (curr_cmd)
+					except Exception as error:
+						_log.exception(curr_cmd)
 						if re.match (r"^NOTICE:.*", str(error)):
 							_log.warning(self.fmt_msg(error))
 						else:
+							_log.error(self.fmt_msg(error))
+							if hasattr(error, 'diag'):
+								for prop in dir(error.diag):
+									if prop.startswith(u'__'):
+										continue
+									val = getattr(error.diag, prop)
+									if val is None:
+										continue
+									_log.error(u'PG diags %s: %s', prop, val)
 							if self.vars['ON_ERROR_STOP']:
-								_log.error(self.fmt_msg(error))
+								self.conn.commit()
+								curs.close()
 								return 1
-							else:
-								_log.debug(self.fmt_msg(error))
 
 					self.conn.commit()
 					curs.close()
@@ -204,6 +191,7 @@ class Psql:
 		self.conn.commit()
 		curs.close()
 		return 0
+
 #===================================================================
 # testing code
 if __name__ == '__main__':
@@ -219,4 +207,3 @@ if __name__ == '__main__':
 	psql = Psql (conn)
 	psql.run (sys.argv[1])
 	conn.close ()
-#===================================================================
diff --git a/client/pycommon/x-test-default_ro.py b/client/pycommon/x-test-default_ro.py
new file mode 100644
index 0000000..ef3df0c
--- /dev/null
+++ b/client/pycommon/x-test-default_ro.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+#
+# please run this script against a database which is configured to be readonly by:
+#
+#	alter databaes <NAME> set default_transaction_read_only to on
+#
+# if cmd line argument is "show_problem" -> exhibit the problem
+
+db = u'gnumed_v20'		# a database configured "alter database %s set default_transaction_read_only to on"
+user = 'gm-dbo'			# a user with CREATE DATABASE powers
+
+#--------------------------------------------------------------------------------
+import sys
+import psycopg2
+
+
+cmd_def_tx_ro = "SELECT upper(source), name, upper(setting) FROM pg_settings WHERE name = 'default_transaction_read_only'"
+cmd_create_db = "create database %s_copy template %s" % (db, db)
+cmd_drop_db = "drop database %s_copy" % db
+
+show_problem = False
+if len(sys.argv) > 1:
+	if sys.argv[1] == 'show_problem':
+		show_problem = True
+
+conn = psycopg2.connect(dbname = db, user = user)
+print 'conn:', conn
+print 'readonly:', conn.readonly
+print 'autocommit:', conn.autocommit
+print 'setting autocommit to False'
+conn.autocommit = False
+print 'autocommit now:', conn.autocommit
+if show_problem:
+	print 'vvvvv this creates the problem vvvvv'
+	print ' setting readonly to False'
+	conn.readonly = False
+	print ' readonly now:', conn.readonly
+	print '^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^'
+print 'setting autocommit to True'
+conn.autocommit = True
+print 'autocommit now:', conn.autocommit
+print 'setting readonly to False'
+conn.readonly = False
+print 'readonly now:', conn.readonly
+curs = conn.cursor()
+curs.execute(cmd_def_tx_ro)
+print 'querying DEFAULT_TRANSACTION_READ_ONLY state (should show "ON")'
+print curs.fetchall()
+curs.close()
+conn.commit()
+print 'the following SQL will fail:', cmd_create_db
+print '(note that the transaction being talked about is implicit to PostgreSQL, due to autocommit mode)'
+curs = conn.cursor()
+try:
+	curs.execute(cmd_create_db)
+	curs.execute(cmd_drop_db)
+except psycopg2.InternalError as ex:
+	print 'SQL failed:'
+	print ex
+
+print 'shutting down'
+
+curs.close()
+conn.rollback()
+conn.close()
diff --git a/client/pycommon/x-test-psy.py b/client/pycommon/x-test-psy.py
new file mode 100644
index 0000000..f030df2
--- /dev/null
+++ b/client/pycommon/x-test-psy.py
@@ -0,0 +1,203 @@
+
+db = u'gnumed_v20'		# a database configured "alter database %s set default_transaction_read_only to on"
+user = 'gm-dbo'			# a user with CREATE DATABASE powers
+
+
+
+cmd_def_tx_ro = "SELECT upper(source), name, upper(setting) FROM pg_settings WHERE name = 'default_transaction_read_only'"
+cmd_create_db = "create database %s_copy template %s" % (db, db)
+
+
+import sys
+import psycopg2
+
+
+conn = psycopg2.connect(dbname = db, user = user)
+print 'readonly:', conn.readonly
+print 'autocommit:', conn.autocommit
+conn.readonly = False
+print 'readonly now:', conn.readonly
+#curs = conn.cursor()
+#curs.execute(cmd_def_tx_ro)
+#print 'should show DEFAULT_TRANSACTION_READ_ONLY set to ON'
+#print curs.fetchall()
+#curs.close()
+#conn.commit()
+conn.autocommit = True
+print 'readonly:', conn.readonly
+print 'autocommit:', conn.autocommit
+print 'the following CREATE DATABASE should fail'
+curs = conn.cursor()
+curs.execute(cmd_create_db)
+curs.close()
+conn.rollback()
+conn.close()
+
+sys.exit()
+
+
+
+
+
+curs = conn.cursor()
+#cmd_def_tx_ro = u'show default_transaction_read_only;'
+cmd_def_tx_ro = "SELECT upper(source), name, upper(setting) FROM pg_settings WHERE name = 'default_transaction_read_only'"
+cmd_tx_ro = u'show transaction_read_only;'
+cmd_DEL = u'DELETE FROM dem.identity where pk is NULL'
+
+print conn
+print 'initial RO state:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+
+#print ''
+print 'setting <conn.readonly = False> ...'
+conn.readonly = False
+print 'RO state in same TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+print 'RO state in next TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+
+print ''
+print 'setting <conn.autocommit = True> (conn.readonly still False) ...'
+print '-> means exiting psyco TX handling, needed for some DDL such as CREATE DATABASE ...'
+conn.autocommit = True
+print 'RO state in same TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+print 'RO state in next TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+
+print ''
+print 'setting <conn.autocommit = False> (conn.readonly still False) ...'
+print '-> means exiting psyco TX handling, needed for some DDL such as CREATE DATABASE ...'
+conn.autocommit = False
+print 'RO state in same TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+print 'RO state in same TX:'
+print '  psyco (conn.readonly):', conn.readonly
+print '  psyco (conn.autocommit):', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_def_tx_ro
+curs.execute(cmd_tx_ro)
+print '  PG:', curs.fetchall(), u'- %s' % cmd_tx_ro
+print '  running DELETE:', cmd_DEL
+try:
+	curs.execute(cmd_DEL)
+	print '  success'
+except Exception as e:
+	print '  failed:', e
+conn.commit()
+
+
+
+sys.exit()
+
+
+
+
+
+
+print 'RO state in same TX:'
+print '  psyco - conn.readonly:', conn.readonly
+print '  psyco - conn.autocommit:', conn.autocommit
+curs.execute(cmd_def_tx_ro)
+print '  PG - default_transaction_read_only:', curs.fetchall()
+curs.execute(cmd_tx_ro)
+print '  PG - transaction_read_only:', curs.fetchall()
+conn.commit()
+print 'RO state in next TX:'
+print '  psyco - conn.readonly:', conn.readonly
+curs.execute(cmd_def_tx_ro)
+print '  PG - default_transaction_read_only:', curs.fetchall()
+curs.execute(cmd_tx_ro)
+print '  PG - transaction_read_only:', curs.fetchall()
+conn.commit()
+
+print ''
+
+print 'PG/psyco split brain because of:'
+cmd = "SELECT upper(source), name, upper(setting) FROM pg_settings WHERE name = 'default_transaction_read_only'"
+print '  SQL:', cmd
+curs.execute(cmd)
+print '  PG:', curs.fetchall()
+
+
+
+conn.commit()
+curs.execute(u'DELETE FROM dem.identity where pk is NULL')
+
+
+curs.close()
+conn.commit()
+conn.close()
diff --git a/client/wxpython/gmDataMiningWidgets.py b/client/wxpython/gmDataMiningWidgets.py
index aa00a71..845a881 100644
--- a/client/wxpython/gmDataMiningWidgets.py
+++ b/client/wxpython/gmDataMiningWidgets.py
@@ -215,7 +215,7 @@ class cDataMiningPnl(wxgDataMiningPnl.wxgDataMiningPnl):
 		self.__init_ui()
 
 		# make me a file drop target
-		dt = gmGuiHelpers.cFileDropTarget(self)
+		dt = gmGuiHelpers.cFileDropTarget(target = self)
 		self.SetDropTarget(dt)
 	#--------------------------------------------------------
 	def __init_ui(self):
@@ -248,7 +248,7 @@ class cDataMiningPnl(wxgDataMiningPnl.wxgDataMiningPnl):
 	#--------------------------------------------------------
 	# file drop target API
 	#--------------------------------------------------------
-	def add_filenames(self, filenames):
+	def _drop_target_consume_filenames(self, filenames):
 		# act on first file only
 		fname = filenames[0]
 		_log.debug('importing SQL from <%s>', fname)
diff --git a/client/wxpython/gmDeviceWidgets.py b/client/wxpython/gmDeviceWidgets.py
index 08baea6..49ca960 100644
--- a/client/wxpython/gmDeviceWidgets.py
+++ b/client/wxpython/gmDeviceWidgets.py
@@ -107,7 +107,7 @@ class cCardiacDevicePluginPnl(wxgCardiacDevicePluginPnl.wxgCardiacDevicePluginPn
 			# since get_documents() is sorted I simply get the first one as the most recent one
 			# for now assume that the xml file provide the cardiac device context.
 			# that pretty much means logical connection of leads and generator is provided in the xml
-			xml_fname = checkups[-1].parts[0].export_to_file()
+			xml_fname = checkups[-1].parts[0].save_to_file()
 			tree = etree.parse(xml_fname)
 			DevicesDisplayed = gmDevices.device_status_as_text(tree)
 			text = u''.join(DevicesDisplayed)
diff --git a/client/wxpython/gmDocumentWidgets.py b/client/wxpython/gmDocumentWidgets.py
index a2dcd4e..36bd8fa 100644
--- a/client/wxpython/gmDocumentWidgets.py
+++ b/client/wxpython/gmDocumentWidgets.py
@@ -271,9 +271,7 @@ def save_files_as_new_document(parent=None, filenames=None, document_type=None,
 				u'\n'
 				u'Do you want to delete imported files from the filesystem ?\n'
 				u'\n'
-				u' %s\n'
-				u'\n'
-				u'Note that temporary files will be deleted anyway.'
+				u' %s'
 			) % u'\n '.join(files2remove),
 			_('Removing files')
 		)
@@ -893,12 +891,11 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
 		self.__init_ui_data()
 		self._PhWheel_doc_type.add_callback_on_lose_focus(self._on_doc_type_loses_focus)
 
-		# make me and listctrl a file drop target
-		dt = gmGuiHelpers.cFileDropTarget(self)
+		# make me and listctrl file drop targets
+		dt = gmGuiHelpers.cFileDropTarget(target = self)
 		self.SetDropTarget(dt)
-		dt = gmGuiHelpers.cFileDropTarget(self._LCTRL_doc_pages)
+		dt = gmGuiHelpers.cFileDropTarget(on_drop_callback = self._drop_target_consume_filenames)
 		self._LCTRL_doc_pages.SetDropTarget(dt)
-		self._LCTRL_doc_pages.add_filenames = self._add_parts_from_dropped_path_or_files
 
 		# do not import globally since we might want to use
 		# this module without requiring any scanner to be available
@@ -908,7 +905,7 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
 	#--------------------------------------------------------
 	# file drop target API
 	#--------------------------------------------------------
-	def _add_parts_from_dropped_path_or_files(self, filenames):
+	def _drop_target_consume_filenames(self, filenames):
 		pat = gmPerson.gmCurrentPatient()
 		if not pat.connected:
 			gmDispatcher.send(signal='statustext', msg=_('Cannot accept new documents. No active patient.'))
@@ -921,8 +918,8 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
 				files = os.listdir(pathname)
 				source = _('directory dropped on client')
 				gmDispatcher.send(signal = 'statustext', msg = _('Extracting files from folder [%s] ...') % pathname)
-				for file in files:
-					fullname = os.path.join(pathname, file)
+				for filename in files:
+					fullname = os.path.join(pathname, filename)
 					if not os.path.isfile(fullname):
 						continue
 					real_filenames.append(fullname)
@@ -1611,8 +1608,9 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 		wx.EVT_MENU(self.__part_context_menu, ID, self.__mail_part)
 
 		ID = wx.NewId()
-		self.__part_context_menu.Append(ID, _('Export part'))
-		wx.EVT_MENU(self.__part_context_menu, ID, self.__export_part_to_disk)
+		self.__part_context_menu.Append(ID, _('Save part to disk'))
+		wx.EVT_MENU(self.__part_context_menu, ID, self.__save_part_to_disk)
+
 
 		self.__part_context_menu.AppendSeparator()			# so we can append some items
 
@@ -1648,8 +1646,11 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 		wx.EVT_MENU(self.__doc_context_menu, ID, self.__mail_doc)
 
 		ID = wx.NewId()
-		self.__doc_context_menu.Append(ID, _('Export all parts'))
-		wx.EVT_MENU(self.__doc_context_menu, ID, self.__export_doc_to_disk)
+		self.__doc_context_menu.Append(ID, _('Save all parts to disk'))
+		wx.EVT_MENU(self.__doc_context_menu, ID, self.__save_doc_to_disk)
+
+		item = self.__doc_context_menu.Append(-1, _('Copy all parts to export area'))
+		self.Bind(wx.EVT_MENU, self.__copy_doc_to_export_area, item)
 
 		self.__doc_context_menu.AppendSeparator()
 
@@ -2321,7 +2322,7 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 			default = default_chunksize
 		))
 
-		part_file = self.__curr_node_data.export_to_file(aChunkSize = chunksize)
+		part_file = self.__curr_node_data.save_to_file(aChunkSize = chunksize)
 
 		if action == 'print':
 			cmd = u'%s generic_document %s' % (external_cmd, part_file)
@@ -2370,8 +2371,8 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 	def __mail_part(self, evt):
 		self.__process_part(action = u'mail', l10n_action = _('mail'))
 	#--------------------------------------------------------
-	def __export_part_to_disk(self, evt):
-		"""Export document part into directory."""
+	def __save_part_to_disk(self, evt):
+		"""Save document part into directory."""
 
 		dlg = wx.DirDialog (
 			parent = self,
@@ -2405,7 +2406,7 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 			default = default_chunksize
 		))
 
-		fname = self.__curr_node_data.export_to_file (
+		fname = self.__curr_node_data.save_to_file (
 			aChunkSize = chunksize,
 			filename = fname,
 			target_mime = None
@@ -2413,9 +2414,10 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 
 		wx.EndBusyCursor()
 
-		gmDispatcher.send(signal = 'statustext', msg = _('Successfully exported document part as [%s].') % fname)
+		gmDispatcher.send(signal = 'statustext', msg = _('Successfully saved document part as [%s].') % fname)
 
 		return True
+
 	#--------------------------------------------------------
 	# document level context menu handlers
 	#--------------------------------------------------------
@@ -2467,7 +2469,7 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 			default = default_chunksize
 		))
 
-		part_files = self.__curr_node_data.export_parts_to_files(chunksize = chunksize)
+		part_files = self.__curr_node_data.save_parts_to_files(chunksize = chunksize)
 
 		if os.name == 'nt':
 			blocking = True
@@ -2597,8 +2599,8 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 				_('Accessing external document')
 			)
 	#--------------------------------------------------------
-	def __export_doc_to_disk(self, evt):
-		"""Export document into directory.
+	def __save_doc_to_disk(self, evt):
+		"""Save document into directory.
 
 		- one file per object
 		- into subdirectory named after patient
@@ -2632,13 +2634,18 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 			default = default_chunksize
 		))
 
-		fnames = self.__curr_node_data.export_parts_to_files(export_dir = dirname, chunksize = chunksize)
+		fnames = self.__curr_node_data.save_parts_to_files(export_dir = dirname, chunksize = chunksize)
 
 		wx.EndBusyCursor()
 
-		gmDispatcher.send(signal='statustext', msg=_('Successfully exported %s parts into the directory [%s].') % (len(fnames), dirname))
+		gmDispatcher.send(signal='statustext', msg=_('Successfully saved %s parts into the directory [%s].') % (len(fnames), dirname))
 
 		return True
+
+	#--------------------------------------------------------
+	def __copy_doc_to_export_area(self, evt):
+		gmPerson.gmCurrentPatient().export_area.add_documents(documents = [self.__curr_node_data])
+
 	#--------------------------------------------------------
 	def __delete_document(self, evt):
 		delete_it = gmGuiHelpers.gm_show_question (
@@ -3115,7 +3122,14 @@ class cPACSPluginPnl(wxgPACSPluginPnl, gmRegetMixin.cRegetOnPaintMixin):
 		if self.__pacs is None:
 			return
 
-		dlg = cModifyOrthancContentDlg(self, -1, server = self.__pacs)
+		title = _('Working on: Orthanc "%s" (AET "%s" @ %s:%s, Version %s)') % (
+			self.__pacs.server_identification['Name'],
+			self.__pacs.server_identification['DicomAet'],
+			self._TCTRL_host.Value.strip(),
+			self._TCTRL_port.Value.strip(),
+			self.__pacs.server_identification['Version']
+		)
+		dlg = cModifyOrthancContentDlg(self, -1, server = self.__pacs, title = title)
 		dlg.ShowModal()
 		dlg.Destroy()
 		self._schedule_data_reget()
@@ -3173,8 +3187,10 @@ class cModifyOrthancContentDlg(wxgModifyOrthancContentDlg):
 	def __init__(self, *args, **kwds):
 		self.__srv = kwds['server']
 		del kwds['server']
-		kwds['title'] = _('Editing Orthanc content')
+		title = kwds['title']
+		del kwds['title']
 		wxgModifyOrthancContentDlg.__init__(self, *args, **kwds)
+		self.SetTitle(title)
 		self._LCTRL_patients.set_columns( [_('Patient ID'), _('Name'), _('Birth date'), _('Gender'), _('Orthanc')] )
 
 	#--------------------------------------------------------
@@ -3246,51 +3262,60 @@ class cModifyOrthancContentDlg(wxgModifyOrthancContentDlg):
 			if not success:
 				all_modified = False
 		self.__refresh_patient_list()
+
+		if not all_modified:
+			gmGuiHelpers.gm_show_warning (
+				aTitle = _(u'Modifying patient ID'),
+				aMessage = _(
+					u'I was unable to modify all DICOM patients.\n'
+					u'\n'
+					u'Please refer to the log file.'
+				)
+			)
 		return all_modified
 
 #------------------------------------------------------------
+# outdated:
 def upload_files():
-#	_on_upload_button_pressed(self, event)
-		event.Skip()
-		dlg = wx.DirDialog (
-			self,
-			message = _('Select the directory from which to recursively upload DICOM files.'),
-			defaultPath = os.path.join(gmTools.gmPaths().home_dir, 'gnumed')
-		)
-		choice = dlg.ShowModal()
-		dicom_dir = dlg.GetPath()
-		dlg.Destroy()
-		if choice != wx.ID_OK:
-			return True
-		wx.BeginBusyCursor()
-		try:
-			uploaded, not_uploaded = self.__pacs.upload_from_directory (
-				directory = dicom_dir,
-				recursive = True,
-				check_mime_type = False,
-				ignore_other_files = True
-			)
-		finally:
-			wx.EndBusyCursor()
-		if len(not_uploaded) == 0:
-			q = _('Delete the uploaded DICOM files now ?')
-		else:
-			q = _('Some files have not been uploaded.\n\nDo you want to delete those DICOM files which have been sent to the PACS successfully ?')
-			_log.error(u'not uploaded:')
-			for f in not_uploaded:
-				_log.error(f)
-
-		delete_uploaded = gmGuiHelpers.gm_show_question (
-			title = _('Uploading DICOM files'),
-			question = q,
-			cancel_button = False
+	event.Skip()
+	dlg = wx.DirDialog (
+		self,
+		message = _('Select the directory from which to recursively upload DICOM files.'),
+		defaultPath = os.path.join(gmTools.gmPaths().home_dir, 'gnumed')
+	)
+	choice = dlg.ShowModal()
+	dicom_dir = dlg.GetPath()
+	dlg.Destroy()
+	if choice != wx.ID_OK:
+		return True
+	wx.BeginBusyCursor()
+	try:
+		uploaded, not_uploaded = self.__pacs.upload_from_directory (
+			directory = dicom_dir,
+			recursive = True,
+			check_mime_type = False,
+			ignore_other_files = True
 		)
-		if not delete_uploaded:
-			return
-		wx.BeginBusyCursor()
-		for f in uploaded:
-			gmTools.remove_file(f)
+	finally:
 		wx.EndBusyCursor()
+	if len(not_uploaded) == 0:
+		q = _('Delete the uploaded DICOM files now ?')
+	else:
+		q = _('Some files have not been uploaded.\n\nDo you want to delete those DICOM files which have been sent to the PACS successfully ?')
+		_log.error(u'not uploaded:')
+		for f in not_uploaded:
+			_log.error(f)
+		delete_uploaded = gmGuiHelpers.gm_show_question (
+		title = _('Uploading DICOM files'),
+		question = q,
+		cancel_button = False
+	)
+	if not delete_uploaded:
+		return
+	wx.BeginBusyCursor()
+	for f in uploaded:
+		gmTools.remove_file(f)
+	wx.EndBusyCursor()
 
 #============================================================
 # main
diff --git a/client/wxpython/gmEMRBrowser.py b/client/wxpython/gmEMRBrowser.py
index 983cf88..56ab1d3 100644
--- a/client/wxpython/gmEMRBrowser.py
+++ b/client/wxpython/gmEMRBrowser.py
@@ -1447,9 +1447,9 @@ class cEMRJournalPluginPnl(wxgEMRJournalPluginPnl.wxgEMRJournalPluginPnl):
 		self._TCTRL_journal.SetValue(u'')
 		exporter = gmPatientExporter.cEMRJournalExporter()
 		if self._RBTN_by_encounter.GetValue():
-			fname = exporter.export_to_file_by_encounter(patient = gmPerson.gmCurrentPatient())
+			fname = exporter.save_to_file_by_encounter(patient = gmPerson.gmCurrentPatient())
 		else:
-			fname = exporter.export_to_file_by_mod_time(patient = gmPerson.gmCurrentPatient())
+			fname = exporter.save_to_file_by_mod_time(patient = gmPerson.gmCurrentPatient())
 
 		f = io.open(fname, mode = 'rt', encoding = 'utf8', errors = 'replace')
 		for line in f:
diff --git a/client/wxpython/gmExportAreaWidgets.py b/client/wxpython/gmExportAreaWidgets.py
index 1870f4e..0d62981 100644
--- a/client/wxpython/gmExportAreaWidgets.py
+++ b/client/wxpython/gmExportAreaWidgets.py
@@ -167,7 +167,7 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 
 		files2print = []
 		for item in items:
-			files2print.append(item.export_to_file())
+			files2print.append(item.save_to_file())
 
 		if len(files2print) == 0:
 			return
@@ -231,7 +231,7 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 				return True
 			if reuse_nonempty_dir is False:
 				path = gmTools.mk_sandbox_dir (
-					prefix = u'export-%s-' % gmPerson.gmCurrentPatient().dirname,
+					prefix = u'%s-' % gmPerson.gmCurrentPatient().dirname,
 					base_dir = path
 				)
 
@@ -345,7 +345,7 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 
 		files2mail = []
 		for item in items:
-			files2mail.append(item.export_to_file())
+			files2mail.append(item.save_to_file())
 
 		cmd = u'%s %s' % (external_cmd, u' '.join(files2mail))
 		if os.name == 'nt':
@@ -380,7 +380,7 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 
 		files2fax = []
 		for item in items:
-			files2fax.append(item.export_to_file())
+			files2fax.append(item.save_to_file())
 
 		fax_number = wx.GetTextFromUser (
 			_('Please enter the fax number here !\n\n'
@@ -453,12 +453,11 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 				tt = _('<gm-burn_doc(.bat) not found>')
 			self._BTN_burn_items.SetToolTipString(tt)
 
-		# make me and listctrl a file drop target
-		dt = gmGuiHelpers.cFileDropTarget(self)
+		# make me and listctrl file drop targets
+		dt = gmGuiHelpers.cFileDropTarget(target = self)
 		self.SetDropTarget(dt)
-		dt = gmGuiHelpers.cFileDropTarget(self._LCTRL_items)
+		dt = gmGuiHelpers.cFileDropTarget(on_drop_callback = self._drop_target_consume_filenames)
 		self._LCTRL_items.SetDropTarget(dt)
-		self._LCTRL_items.add_filenames = self.add_filenames_to_listctrl
 
 	#--------------------------------------------------------
 	def save_soap_note(self, soap=None):
@@ -475,10 +474,7 @@ class cExportAreaPluginPnl(wxgExportAreaPluginPnl.wxgExportAreaPluginPnl, gmRege
 	#--------------------------------------------------------
 	# file drop target API
 	#--------------------------------------------------------
-	def add_filenames_to_listctrl(self, filenames):
-		self.add_filenames(filenames = filenames)
-	#--------------------------------------------------------
-	def add_filenames(self, filenames):
+	def _drop_target_consume_filenames(self, filenames):
 		pat = gmPerson.gmCurrentPatient()
 		if not pat.connected:
 			gmDispatcher.send(signal = 'statustext', msg = _('Cannot accept new documents. No active patient.'))
@@ -596,7 +592,7 @@ class cPrintMgrPluginPnl(wxgPrintMgrPluginPnl.wxgPrintMgrPluginPnl, gmRegetMixin
 
 		files2print = []
 		for printout in printouts:
-			files2print.append(printout.export_to_file())
+			files2print.append(printout.save_to_file())
 
 		if len(files2print) == 0:
 			return
diff --git a/client/wxpython/gmFormWidgets.py b/client/wxpython/gmFormWidgets.py
index 5018368..4e49771 100644
--- a/client/wxpython/gmFormWidgets.py
+++ b/client/wxpython/gmFormWidgets.py
@@ -81,7 +81,7 @@ def print_doc_from_template(parent=None, jobtype=None, episode=None, edit_form=N
 def print_doc_from_ooo_template(template=None):
 
 	# export template to file
-	filename = template.export_to_file()
+	filename = template.save_to_file()
 	if filename is None:
 		gmGuiHelpers.gm_show_error (
 			_(	'Error exporting form template\n'
@@ -730,7 +730,7 @@ class cFormTemplateEAPnl(wxgFormTemplateEditAreaPnl.wxgFormTemplateEditAreaPnl,
 		result = dlg.ShowModal()
 		if result != wx.ID_CANCEL:
 			fname = dlg.GetPath()
-			self.data.export_to_file(filename = fname)
+			self.data.save_to_file(filename = fname)
 		dlg.Destroy()
 
 		event.Skip()
diff --git a/client/wxpython/gmGuiHelpers.py b/client/wxpython/gmGuiHelpers.py
index 4054422..3956f05 100644
--- a/client/wxpython/gmGuiHelpers.py
+++ b/client/wxpython/gmGuiHelpers.py
@@ -375,16 +375,28 @@ class cFileDropTarget(wx.FileDropTarget):
 		Widgets being declared file drop targets
 		must provide the method:
 
-			add_filenames(filenames)
+			def _drop_target_consume_filenames(self, filenames)
+
+		or declare a callback during __init__() of this class.
 	"""
 	#-----------------------------------------------
-	def __init__(self, target):
+	def __init__(self, target=None, on_drop_callback=None):
+		if target is not None:
+			try:
+				on_drop_callback = getattr(target, '_drop_target_consume_filenames')
+			except AttributeError:
+				_log.exception('[%s._drop_target_consume_filenames()] does not exist, cannot set as drop target callback', target)
+				raise
+		if not callable(on_drop_callback):
+			_log.error('[%s] not callable, cannot set as drop target callback', on_drop_callback)
+			raise AttributeError('[%s] not callable, cannot set as drop target callback', on_drop_callback)
+		self._on_drop_callback = on_drop_callback
 		wx.FileDropTarget.__init__(self)
-		self.target = target
-		_log.debug('setting up [%s] as file drop target', target)
+		_log.debug('setting up [%s] as file drop target', self._on_drop_callback)
+
 	#-----------------------------------------------
 	def OnDropFiles(self, x, y, filenames):
-		self.target.add_filenames(filenames)
+		self._on_drop_callback(filenames)
 
 # ========================================================================
 def file2scaled_image(filename=None, height=100):
diff --git a/client/wxpython/gmGuiMain.py b/client/wxpython/gmGuiMain.py
index 4ba935b..13a1b87 100644
--- a/client/wxpython/gmGuiMain.py
+++ b/client/wxpython/gmGuiMain.py
@@ -2925,7 +2925,7 @@ class gmTopLevelFrame(wx.Frame):
 
 		wx.BeginBusyCursor()
 		try:
-			fname = exporter.export_to_file_by_mod_time(filename = fname, patient = pat)
+			fname = exporter.save_to_file_by_mod_time(filename = fname, patient = pat)
 		except:
 			wx.EndBusyCursor()
 			_log.exception('error exporting EMR')
@@ -2971,7 +2971,7 @@ class gmTopLevelFrame(wx.Frame):
 
 		wx.BeginBusyCursor()
 		try:
-			fname = exporter.export_to_file_by_encounter(filename = fname, patient = pat)
+			fname = exporter.save_to_file_by_encounter(filename = fname, patient = pat)
 		except:
 			wx.EndBusyCursor()
 			_log.exception('error exporting EMR')
@@ -2997,7 +2997,7 @@ class gmTopLevelFrame(wx.Frame):
 		exporter = gmPatientExporter.cEMRJournalExporter()
 		wx.BeginBusyCursor()
 		try:
-			fname = exporter.export_to_file_by_mod_time(patient = pat)
+			fname = exporter.save_to_file_by_mod_time(patient = pat)
 		except:
 			wx.EndBusyCursor()
 			_log.exception('error exporting EMR')
@@ -3023,7 +3023,7 @@ class gmTopLevelFrame(wx.Frame):
 		exporter = gmPatientExporter.cEMRJournalExporter()
 		wx.BeginBusyCursor()
 		try:
-			fname = exporter.export_to_file_by_encounter(patient = pat)
+			fname = exporter.save_to_file_by_encounter(patient = pat)
 		except:
 			wx.EndBusyCursor()
 			_log.exception('error exporting EMR')
diff --git a/client/wxpython/gmMacro.py b/client/wxpython/gmMacro.py
index 327c5f3..121a2c0 100644
--- a/client/wxpython/gmMacro.py
+++ b/client/wxpython/gmMacro.py
@@ -929,7 +929,7 @@ class gmPlaceholderHandler(gmBorg.cBorg):
 				for desc in doc.get_descriptions(max_lng = None):
 					lines.append(self._escape(desc['text'] + u'\n'))
 			if path_template is not None:
-				for part_name in doc.export_parts_to_files(export_dir = export_path):
+				for part_name in doc.save_parts_to_files(export_dir = export_path):
 					path, name = os.path.split(part_name)
 					lines.append(path_template % {'fullpath': part_name, 'name': name})
 
@@ -1492,7 +1492,7 @@ class gmPlaceholderHandler(gmBorg.cBorg):
 				if self.debug:
 					return self._escape(_('no mugshot available'))
 				return u''
-			fname = mugshot.export_to_file (
+			fname = mugshot.save_to_file (
 				target_mime = target_mime,
 				target_extension = target_ext,
 				ignore_conversion_problems = True
@@ -2227,7 +2227,7 @@ class gmPlaceholderHandler(gmBorg.cBorg):
 				return self._escape(_('no binary expansion found for keyword <%s>') % keyword)
 			return u''
 
-		filename = expansion.export_to_file()
+		filename = expansion.save_to_file()
 		if filename is None:
 			if self.debug:
 				return self._escape(_('cannot export data of binary expansion keyword <%s>') % keyword)
diff --git a/client/wxpython/gmMeasurementWidgets.py b/client/wxpython/gmMeasurementWidgets.py
index cb861c8..217f661 100644
--- a/client/wxpython/gmMeasurementWidgets.py
+++ b/client/wxpython/gmMeasurementWidgets.py
@@ -196,7 +196,7 @@ def browse_incoming_unmatched(parent=None):
 			return False
 		if u'HL7' not in staged_item['data_type']:
 			return False
-		filename = staged_item.export_to_file()
+		filename = staged_item.save_to_file()
 		if filename is None:
 			filename = gmTools.get_unique_filename()
 		tmp_file = io.open(filename, mode = 'at', encoding = 'utf8')
diff --git a/client/wxpython/gmMedicationWidgets.py b/client/wxpython/gmMedicationWidgets.py
index ba58577..c7a3f81 100644
--- a/client/wxpython/gmMedicationWidgets.py
+++ b/client/wxpython/gmMedicationWidgets.py
@@ -2073,9 +2073,8 @@ class cCurrentSubstancesPnl(wxgCurrentSubstancesPnl.wxgCurrentSubstancesPnl, gmR
 			lbl = wx.StaticText(self, -1, _('eGFR:'))
 			lbl.SetForegroundColour('blue')
 			val = wx.StaticText(self, -1, gfr_msg)
-			egfrs = calc.eGFRs
 			tts = []
-			for egfr in egfrs:
+			for egfr in calc.eGFRs:
 				if egfr.numeric_value is None:
 					continue
 				tts.append(egfr.format (
@@ -2088,8 +2087,7 @@ class cCurrentSubstancesPnl(wxgCurrentSubstancesPnl.wxgCurrentSubstancesPnl, gmR
 					with_sub_results = False,
 					return_list = False
 				))
-				tt = u'\n'.join(tts)
-			val.SetToolTipString(tt)
+			val.SetToolTipString(u'\n'.join(tts))
 			szr = wx.BoxSizer(wx.HORIZONTAL)
 			szr.Add(lbl, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 3)
 			szr.Add(val, 1, wx.ALIGN_CENTER_VERTICAL)
diff --git a/client/wxpython/gmNarrativeWorkflows.py b/client/wxpython/gmNarrativeWorkflows.py
index 9b65692..ee3f03e 100644
--- a/client/wxpython/gmNarrativeWorkflows.py
+++ b/client/wxpython/gmNarrativeWorkflows.py
@@ -407,7 +407,7 @@ def export_narrative_for_medistar_import(parent=None, soap_cats=u'soapu', encoun
 	wx.BeginBusyCursor()
 	_log.debug('exporting encounter for medistar import to [%s]', fname)
 	exporter = gmPatientExporter.cMedistarSOAPExporter(patient = pat)
-	successful, fname = exporter.export_to_file (
+	successful, fname = exporter.save_to_file (
 		filename = fname,
 		encounter = encounter,
 		soap_cats = u'soapu',
diff --git a/client/wxpython/gmPatPicWidgets.py b/client/wxpython/gmPatPicWidgets.py
index 3267997..d1bc664 100644
--- a/client/wxpython/gmPatPicWidgets.py
+++ b/client/wxpython/gmPatPicWidgets.py
@@ -174,7 +174,7 @@ class cPatientPicture(wx.StaticBitmap):
 			))
 #			gmDispatcher.send(signal='statustext', msg=_('Cannot get most recent patient photo from database.'))
 		else:
-			fname = photo.export_to_file()
+			fname = photo.save_to_file()
 			self.SetToolTipString (_(
 				'Patient picture (%s).\n'
 				'\n'
diff --git a/client/wxpython/gmProviderInboxWidgets.py b/client/wxpython/gmProviderInboxWidgets.py
index f766e5e..4dcfae7 100644
--- a/client/wxpython/gmProviderInboxWidgets.py
+++ b/client/wxpython/gmProviderInboxWidgets.py
@@ -473,12 +473,13 @@ class cProviderInboxPnl(wxgProviderInboxPnl.wxgProviderInboxPnl, gmRegetMixin.cR
 		gmDispatcher.connect(signal = u'blobs.doc_med_mod_db', receiver = self._on_doc_mod_db)
 		gmDispatcher.connect(signal = u'blobs.reviewed_doc_objs_mod_db', receiver = self._on_doc_obj_review_mod_db)
 		gmDispatcher.connect(signal = u'post_patient_selection', receiver = self._on_post_patient_selection)
+
 	#--------------------------------------------------------
 	def __init_ui(self):
 		self._LCTRL_provider_inbox.debug = 'provider inbox list'
 
-		self._LCTRL_provider_inbox.set_columns([u'', _('Generated'), _('Status'), _('Category - Type'), _('Message')])
-		self._LCTRL_provider_inbox.searchable_columns = [2, 3, 4]
+		self._LCTRL_provider_inbox.set_columns([u'', _('Generated'), _('Status'), _('Patient'), _('Message'), _('Category - Type')])
+		self._LCTRL_provider_inbox.searchable_columns = [2, 3, 4, 5]
 		self._LCTRL_provider_inbox.item_tooltip_callback = self._get_msg_tooltip
 		self._LCTRL_provider_inbox.extend_popup_menu_callback = self._extend_popup_menu
 
@@ -486,6 +487,7 @@ class cProviderInboxPnl(wxgProviderInboxPnl.wxgProviderInboxPnl, gmRegetMixin.cR
 
 		if gmPerson.gmCurrentPatient().connected:
 			self._CHBOX_active_patient.Enable()
+
 	#--------------------------------------------------------
 	def __update_greeting(self, no_of_messages=None):
 		msg = _(' Inbox of %s %s%s') % (
@@ -497,6 +499,7 @@ class cProviderInboxPnl(wxgProviderInboxPnl.wxgProviderInboxPnl, gmRegetMixin.cR
 			gmTools.coalesce(no_of_messages, u'.', _(': %s message(s)'))
 		)
 		self._msg_welcome.SetLabel(msg)
+
 	#--------------------------------------------------------
 	def __populate_inbox(self):
 		_log.debug('populating provider inbox')
@@ -601,8 +604,19 @@ class cProviderInboxPnl(wxgProviderInboxPnl.wxgProviderInboxPnl, gmRegetMixin.cR
 						item.append(_('%s overdue') % gmDateTime.format_interval_medically(m['interval_due']))
 					else:
 						item.append(_('due in %s') % gmDateTime.format_interval_medically(m['interval_due']))
-			item.append(u'%s - %s' % (m['l10n_category'], m['l10n_type']))
+			#pat
+			if m['pk_patient'] is None:
+				item.append(u'')
+			else:
+				item.append(u'%s, %s%s %s #%s' % (
+					m['lastnames'],
+					m['firstnames'],
+					gmTools.coalesce(m['l10n_gender'], u'', u' (%s)'),
+					gmDateTime.pydt_strftime(m['dob_only'], u'%Y %b %d', none_str = u''),
+					m['pk_patient']
+				))
 			item.append(m['comment'])
+			item.append(u'%s - %s' % (m['l10n_category'], m['l10n_type']))
 			items.append(item)
 
 		_log.debug('# of list items created from msgs: %s', len(items))
diff --git a/client/wxpython/gmVisualProgressNoteWidgets.py b/client/wxpython/gmVisualProgressNoteWidgets.py
index f48fdf0..e732d80 100644
--- a/client/wxpython/gmVisualProgressNoteWidgets.py
+++ b/client/wxpython/gmVisualProgressNoteWidgets.py
@@ -152,7 +152,7 @@ def select_visual_progress_note_template(parent=None):
 		)
 		if template is None:
 			return (None, None)
-		filename = template.export_to_file()
+		filename = template.save_to_file()
 		if filename is None:
 			gmDispatcher.send(signal = u'statustext', msg = _('Cannot export visual progress note template for [%s].') % template['name_long'])
 			return (None, None)
@@ -189,7 +189,7 @@ def edit_visual_progress_note(filename=None, episode=None, discard_unmodified=Fa
 	"""This assumes <filename> contains an image which can be handled by the configured image editor."""
 
 	if doc_part is not None:
-		filename = doc_part.export_to_file()
+		filename = doc_part.save_to_file()
 		if filename is None:
 			gmDispatcher.send(signal = u'statustext', msg = _('Cannot export visual progress note to file.'))
 			return None
@@ -368,7 +368,7 @@ class cVisualSoapPresenterPnl(wxgVisualSoapPresenterPnl.wxgVisualSoapPresenterPn
 			if len(parts) > 1:
 				parts_str = _(' [part 1 of %s]') % len(parts)
 			part = parts[0]
-			fname = part.export_to_file()
+			fname = part.save_to_file()
 			if fname is None:
 				continue
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gnumed-client.git



More information about the debian-med-commit mailing list