Data model changes
Merge branch 'master' of https://github.com/Bodycote/Barcoding