version number => 1.7.9
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml