Merge branch 'master' into courier

Conflicts:
	external/CacheWord
Enable Screenshots setting

Also, moved activity restart functionality to LockableActivity (needed
for recreating the whole activity when switching language or toggling
the enable screenshots setting)
Merge branch 'master' into master_feature_3247

Conflicts:
	app/src/info/guardianproject/securereaderinterface/LockableActivity.java
Use mPrefs from super class
Use latest library
Added feed to setTagFilter. If given, search whole feed, otherwise current items.
Fix 9-patch image, Bug #3397
Added feed to setTagFilter. If given, search whole feed, otherwise current items.
Merge branch 'master_task_3215' of https://github.com/N-Pex/securereader into master_task_3215
Use current feed filter from app and implement save/restore
Updated strings
Merge pull request #70 from N-Pex/master

Updated strings
Merge pull request #71 from N-Pex/master_bug_3396

Use current feed filter from app and implement save/restore
Use latest library
Merge pull request #72 from N-Pex/master_task_3215

Master task 3215
Merge branch 'master' into master_feature_3247
Merge pull request #73 from N-Pex/master_feature_3247

Master feature 3247
Latest from master
Update to latest, fix to IOCipher mount
export cacheword so notification locking works correctly