added EntityFramework and Di configuration
Merge branch 'origin/master'