added test for forcing collisions by setting speed and speedMode refs #1202

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16018 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Sumo game: revert some changes from [15960]

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16019 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Sumo game: highway scenario with traffic light but still not a game

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16021 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Merge branch 'master' into planet