Minor code cleanup
NFC activity design
more cleanup
Merge branch 'development' into keybase-proofs