fixing crash when loading viewsettings refs #36

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@17051 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing non-internal build after [17050] refs #3

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