Merge remote-tracking branch 'android/master' into hasher
Replaced android app

Removed the old app and added the updated/working one
Merge branch 'homogenize'

Conflicts:
	.gitignore
Fixed bug in password.c that wrote an incorrect and unreliable
password-is-set indicator to flash storage.
Merge branch 'master' into homogenize

Conflicts:
	ARM_code/main.c
	ARM_code/password.c