tmp fix for Barcodes
Merge branch 'master' of https://github.com/dominicglenn/hackathon

Conflicts:
	static/javascripts/app.js