merged because oops
code cleanup
beamin and beamout
merged auth and entities, some planet stuff may be slightly broken
start working on api