12 from MahApp
Igen fast värre
Merge branch 'masterAgain'

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