updated to bootstrap and added barcode lib and ++
Merge branch 'master' into gh-pages