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

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

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

Latest from master