Merge pull request #38 from dvicini/master

map now greys out travel modes if needed
Translation works better with settings together. no more unnessecary translations
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
last polish on settings
commenting...
merging & correcting translation task, this one already had a hasSucceeded method @timm...