[cli] greatly improved staff-end documentation
[cli] allowed empty lines in rubric files. They're treated as comments
Merge remote-tracking branch 'origin/master'