made some minor changes to the Linq calls to entity
Merge branch 'master' of https://github.com/42IN11EWd/RAS-app