Merge branch V2.1.0.x into V2.1.

.gitignore

@@ -0,0 +1,35 @@
+# General ignored files and directories
+.classpath
+.gradle
+.idea
+.project
+.settings
+*.iml
+*.log*
+*.tmp
+*.war
+bin
+dist
+explodedDeps
+
+# /
+/l10n
+/dist
+/root
+
+# /rm-server/
+/rm-server/alfresco-solr.zip
+/rm-server/solr
+/rm-server/shared
+
+# /rm-server/build/
+/rm-server/build/*
+
+# /rm-server/config/alfresco/
+/rm-server/config/alfresco/extension
+
+# /rm-server/libs/
+/rm-server/libs/mysql*
+
+# /rm-share/build/
+/rm-share/build/*