- reworked CmsContextProvider
Merge branch 'master' of https://github.com/cbovis/FluentCMS.git
- fixing merge