time parsing
Merge branch 'development' of github.com:wyne/log into development
Update fields to time entry, add additional logic.
Merge branch 'development'