fixes and stuff

intersection selector
waiting vehicle statistics
Merge remote-tracking branch 'origin/master'

Conflicts:
	Core/cortex.cpp