(no commit message)

diff --cc .gitattributes
Simple merge

diff --cc pom.xml
index cc8605c2c654850fd0e9aed380e8eb2cfdb1f613,6674bacb3385290b5e9223d9e625db5bec641713..55cecc4f157fa9bb1e97112da6ad80d979fa5967
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -259,7 -254,7 +259,7 @@@
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-site-plugin</artifactId>
--                <version>2.1.1</version>
++                <version>3.0</version>
                  <configuration>
                      <locales>en</locales>
                  </configuration>