m
Merge remote-tracking branch 'topi/master'

Conflicts:
	db/products/product.cpp
	db/products/product.h
Bug fix

Fixed barcode length bug.
Merge remote-tracking branch 'tommi/master'
sales osion hakukyselyt kunnossa. sales_tracking osio aloitettu
Fixed check_barcode( QString )
Merge remote-tracking branch 'pekka/master' (broken)

Conflicts:
	db/products/product.cpp
	db/products/product.h
	inventaari.pro