no message
Merge branch 'master' of https://github.com/claydonkey/ean

Conflicts:
	app/controllers/Barcodes.scala