Display token in ListActivity
Resolved merge conflicts