Schema Encoding + Display
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/google/zxing/client/result/PubTransResultParser.java