Added input to the serviceproviders.
Merge branch 'blackwell' of github.com:tdt/core into blackwell
Added the json controller