Merge remote-tracking branch 'Lokaltog/develop' into free-space

Conflicts:
	src/config.h
	src/widgets/widgets.h