Using non-translated language strings
Fix Cacheword Timeout Settings
Merge branch 'master' into courier
Removed unused built-in feeds
New Version
Some new generic strings
Merge string changes
Merge branch 'master' into courier

Conflicts:
	app/AndroidManifest.xml