fixing all-options build refs #3

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16302 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing deprecated input network refs #21

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16303 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing invalid assertion

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