fixed Config behaviour for saved empty strings
merging conflicts
Merge branch 'master' into beta

Conflicts:
	ChangeLog
1.6.1
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml