Fixed the ViewObjectTimeSheet to adjust for changes in ViewObjectTime
Merge origin/master