Working on the settings back-end
Merge branch 'master' of https://github.com/geobalas/trafie