Merge branch 'master' into courier

Conflicts:
	external/CacheWord
Update to latest, fix to IOCipher mount
export cacheword so notification locking works correctly
Logging onDestroy
Merge branch 'courier' of https://github.com/guardianproject/securereader into courier

Conflicts:
	app/src/info/guardianproject/securereaderinterface/LockableActivity.java
Readding ActionBarActivity import