french translations for module users
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop

* '2.3/develop' of github.com:pyrocms/pyrocms:
  Fix some pages bugs for page types
  Fix some errors in pages module
  Polymorphic keywords migration
  Polymorphic Keywords
  Simplified the EntryModelGenerator
french translations for addons module
french translations for blog module
#3238 Adding RSS icon to default theme
Add composer.lock to git, so we can be sure of versions.
When we run the build process the composer.lock will of course be ignored, as that would be annoying for users.
Remove config.php as that gets put there by the installer
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop
Let the installer run with no config.php in there.
We don't need it to be there as its overridden, and the config folder is already writable so this is unnecessary.
Revert unnecessary changes from test fix debugging.
Improved Phing logic for 2.3.
Merge pull request #3263 from joselfonseca/feature/rss-icon

#3238 Adding RSS icon to default theme
Merge pull request #3257 from khalil-tabbal/2.3/develop

french translations for module users
Let phing run phpunit locally and on travis
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop
Added PHP Lint to phing
Made a few fixes to make phplint happy too.
Make cache dir for phplint.
Allow 0 in values
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	.travis.yml
	system/cms/modules/users/views/admin/groups/form.php