api issues
test deployment
Merge branch 'master' of heroku.com:dimetest
some DI changes
some DI changes