Make Android ignores more general, add maven folders

Android.gitignore

@@ -1,30 +1,42 @@
-# built application files
+# Common ignores
+.DS_Store
+*~
+~*
+*.bk
+*.bak
+*.log
+*.tmp
+*.swp
+
+# Android specific ignores
 *.apk
 *.ap_
-
-# files for the dex VM
 *.dex
 
-# Java class files
+# Java ignores
 *.class
 
-# generated files
+# Android standard project ignores
 bin/
 gen/
-
-# Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
+# Eclipse project ignores (With annotations generated files)
 .classpath
 .project
+.factorypath
+.apt_generated/
+.settings/
 
 # Proguard folder generated by Eclipse
 proguard/
 
-# Intellij project files
+# Intellij project ignores
+.idea/
 *.iml
 *.ipr
 *.iws
-.idea/
 
+# Maven standard project ignores (With Idea generated)
+gen-external-apklibs/
+target/