Add docs for the command line
Merge branch 'fireteam2' into gb_master