Merge branch 'master' of github.com:manix84/barcode-scanner

* 'master' of github.com:manix84/barcode-scanner:
  Initial commit