working camera and barcode scanner

with html text in base.html
barcode sacnner
fix conflicts;