update DefaultForm and DefaultPanel
refactor TimeEntryPanel
manual merge TimeEntryPanel