Replaced all singletons by services
Merge branch 'master' of github.com:nenadalm/Train into editor_test