Nu skall det funka
Merge branch 'pr/8'

Conflicts:
	SkanetrafikenAPI/src/se/mah/k3lara/skaneAPI/control/Constants.java