Code refactoring for ContextProvider
Merge branch 'master' of https://github.com/maroun-baydoun/intervention.git