added Staff info
Merge branch 'project2'
% discount
Admin compare and equalize