Added proguard-project file back as building with it requires it.

Moved .gitignore changes to mobile/.gitignore

mobile/.gitignore

@@ -1,11 +1,30 @@
-.classpath
-.project
 .settings/
-bin/
-gen/
-libs/
-proguard-project.txt
-local.properties
 assets/total-conversion-build.user.js
 assets/user-location.user.js
 assets/plugins/
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+out/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+# IntelliJ IDEA user settings
+*.iws
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Proguard logs
+proguard_logs/