more work on the barcode styling
Merge branch 'master' of github.com:tadl/tadlmobile-android

Conflicts:
	assets/www/js/main.js