Merge branch 'master' into develop
-rw-r--r-- 12563 .gitattributes
-rw-r--r-- 89 .gitignore
drwxr-xr-x - ide
-rw-r--r-- 21113 pom.xml
drwxr-xr-x - src