Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated my project
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Smurph82/Superuser
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Smurph82/Superuser
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/master'
2013_0305 getWritableDatabase() instead of getReadableDatabase()

We need a writable database because we run a db.delete() on the
database.
Merge branch 'master' of https://github.com/Smurph82/Superuser