Updates to Upload and Edit

Resource Upload and Edit changes, DBML changes, timesheet