decoder and parser small refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/velet5/busstop/Decoder.scala