Removed Ninject references
Removed Fakes
Merge branch 'master' into themes