Merge corrections
Merge corrections
Merge branch 'develop' into feature/buildCache-with-driver
server/trunk - Update package.json to fix production build issue in web client
Add x6 implementation
Initial commit on develop branch: Snapshot of codebase from Subversion [(7627)](https://sourceforge.net/p/kuwaiba/code/7627/tree/server/branches/version-2.3/)
Initial commit: Snapshot of codebase from Subversion [(r7628)](https://sourceforge.net/p/kuwaiba/code/7628/tree/server/trunk/)
server/branches/version-2.3.0 -- Update webclient pom to solve warning: Parameter 'finalName' is read-only, must not be used in configuration