Merge branch 'MasterBugFixing' into 'master'
[TRANSLATION] update translation files
[TRANSLATION] update translation files
remove org.json library
[WEB RELEASE] Create release 6.4.0
[WEB RELEASE] Prepare next development version 6.4.0-SNAPSHOT
[WEB RELEASE] Prepare next development version 6.4.1-SNAPSHOT
Merge branch '6.4.x' into 'master'
[WEB RELEASE] Prepare next development version 7.0.0-SNAPSHOT
Merge branch 'master' into 'MasterBugFixing'