Added hours to workshift instance
Merge branch 'dev' of https://github.com/knagra/farnsworth into dev
Re-worked the model design, got rid of OneTimeWorkshift, just use a WorkshiftInsance + InstanceInfo