Happy new Year, refs #22

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@15692 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Happy new Year, part 2 refs #22

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

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