Refactored all lambda functions
fixed all database query from strings to linq
Merge branch 'feature/Refactoring' into develop