fixed Config behaviour for saved empty strings
Merge branch 'master' into nook
1.6.1
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml