safety
Merge branch 'feature/AddingEntityFramework_and_API' into develop