Merge branch 'master' into senchaTouchDesktop
-rw-r--r-- 283 .gitignore
-rw-r--r-- 314 .gitmodules
-rw-r--r-- 4958 CMakeLists.txt
-rw-r--r-- 395 JSCoverage.patch
-rw-r--r-- 3393 packwebodf.js
drwxr-xr-x - programs
drwxr-xr-x - simplerevisionserver
drwxr-xr-x - webodf