stub in barcode parsing for zxing
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/lib/sqed_spec.rb
initial implementation of barcode parsing with zbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/sqed/barcode_parser.rb