Merge branch 'next' into new-database-38 new-database-38
-rw-r--r-- 8 .gitignore
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3140 pom.xml
drwxr-xr-x - src