Added dummy data for staffs.
Update StaffDTO to include staff type.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assignment 2/sql/db_populate.sql