Short range scan screen as separate command, added baseline energy
consumption to status screen
Integrated SRS into main computer screen. Reposition starship in case of
an initial/warp collision
Merge branch 'master' of https://github.com/ggeorgovassilis/superstartrek.git