resolve asset merge conflict

code cleanup pt1

git shut up

pull server list from the api

idk

make pretty pt2

merged auth and entities, some planet stuff may be slightly broken

client-side authentication

work on callback

start working on api