Made barcode entry type number.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore