finished MakeTokenActivity
merged changes + processing incoming nfc tags
merged with master