Todos added
Merge branch 'master' of https://github.com/michaelpoetz/backend-generator