zliu44 merge from feature to main
# Conflicts: # Staff.java
# Conflicts: # Products.java # Staff.java