Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:khalil-tabbal/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
settings module : french translation
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
2.2/develop: french translation
Fixes to Persian language
Fixes Issue #2624

Adds a check for duplicate keywords being added to the meta keywords
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
french translations : fixes \' not escaping
Fixed incorrectly named methods in the installer
Merge pull request #2651 from ryun/patch-5

Fixes Issue #2624
Why ever was this in here?
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
keep cache consistent with real database state
Fixed variable typo in the installer lib. Fixes #2590
Fixing issue with double $input vars for chunks ft pre_save
Fix for page: vars

The issue was that the {{ page:var }} tags were not working because the
page vars were not being loaded until after the page was pulled from
the database. The fix is to push the page vars into the ci cached vars
right after we pull the page entry and before we pull the stream entry.