working on protocol for all androids being aware of all other's tokens
Merge branch 'UserIDAndAlias' of github.com:jordenh/DE2VTT into android-remove-token
add code for removing tokens
changed implementation of tabletop
merge
just waiting for proper user notifications
pulling changes from master