Android Fix and Aqeel's latest Changes

Okay, i think i may have solved the Android Git problem.

Aqeel and Sam, what you want to do once this pull request is merged is this:

Before merging this change into your code:

1. Add and commit any changes you currently have
2. Duplicate the "bin", "gen", and ".settings" folders (the .settings folder may be hidden on your computer, in which case you'll need to do this using the command line), and put them on your desktop or in another folder, outside your repository.
3. Run `git fetch upstream` and `git merge upstream/master`. This will delete the bin, gen, and .settings folders from your local repository, and add things to your `.gitignore` file.
4. Take the bin, gen, and .settings folders you copied in step 2, and place them back into your android directory.
5. run `git rm . --cached -r` to get rid of any old copies of the bin and gen folders that git may still have lying around.

From talking to Aqeel and doing some Googling of my own, I've realized that the problem that Aqeel and Sam might have been facing with Git for android development is that Git by default tries to track every file, but we don't want to be keeping track of compiled files, and files that eclipse generates for its own usage, which might change without changing the code in any way.

I just added these files to the `.gitignore`, and then removed them from my copy of the respository. As long as this transition goes smoothly, this should enable Aqeel and Sam to push changes to Git painlessly.