Pan Nov 6
Merge https://github.com/panfayang/EncrypTextV0

Conflicts:
	bin/classes/com/example/encryptextv0/ManageKeysActivity.class
	bin/classes/com/example/encryptextv0/R$id.class
	bin/classes/com/example/encryptextv0/R$layout.class
	bin/classes/com/example/encryptextv0/R$menu.class
	bin/classes/com/example/encryptextv0/R$string.class
	bin/classes/com/example/encryptextv0/R$style.class
	gen/com/example/encryptextv0/R.java
	res/values/strings.xml