reducing include dependencies, refs #1348, #12

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16749 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
lefthand network fixed after turnConflict adaption in [16741], refs #21

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