Merge branch 'master' of github.com:jsroest/mobile_scanner

# Conflicts:
#	example/lib/picklist/barcode_scanner_picklist.dart
#	example/lib/picklist/classes/barcode_at_center.dart

Author: Sander Roest