Finishing CLI

Cleaning up the CLI for final release.
But so far everything alright ...
Fixed some small things
Added restart function
Working Working Working
deleted unix timestamp
CleanedUp
Fixed conflicts
Added DBCommands
implemantation of join
Merge branch 'DB'