Merged pull request #146 from callingshotgun/patch-1.

Added local properties, updated how generated files are detected, added O

Android.gitignore

@@ -8,5 +8,9 @@
 # Java class files
 *.class
 
-# generated GUI files
-*R.java
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties