patching expected results after [15861] refs #21

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15865 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
flagging b50 emergency stop, refs #21, #1186

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15866 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
adding traas to release, refs #563

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15867 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing svn props, refs #22

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