fixed Config behaviour for saved empty strings
Merge branch 'master' into ice-cream-sandwich
1.6.1
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml