DROP TABLE IF EXISTS
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml