DROP TABLE IF EXISTS
version number => 1.7.9
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
Merge branch 'beta' into beta-ics