diff --git a/.gitignore b/.gitignore
index 8cf28611e..8acdf690c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.idea
-commons/gen-external-apklibs/*
-commons/target/*
-out/*
+# IDEA files
 *.iml
+*.iws
 *.ipr
-*.iws
\ No newline at end of file
+.idea
+
+# Gradle
+.gradle
+local.properties
+/commons/app/build
+
+# IDE / Text editor files
+.nb-gradle
+.nb-gradle-properties
+*.sw[op]
+*~
+*.sublime-*
+.textmate
+.java-version
+
+# OS files
+*.DS_Store
+Thumbs.db
\ No newline at end of file