Fix for KillPassphrase
Merge pull request #25 from N-Pex/master

Fix for KillPassphrase
Merge remote-tracking branch 'upstream/master' into yakreader

Conflicts:
	app/src/info/guardianproject/securereaderinterface/SettingsActivity.java
Merge pull request #28 from N-Pex/yakreader

Latest from master