updated Model structure
Merge branch 'integration' of github.com:gryphonshafer/BillableTimeTracker into integration