Updating modules/cms/classes
Updating modules/cms/controllers
Updating modules/cms/formwidgets
Updating modules/cms/lang
Updating modules/cms/twig
Updating modules/cms/widgets
Updating single files in modules/cms
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
Updating files in modules/cms
Fixing test SectionParserTest::testParseOffset
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
Minor code clean
Minor code clean
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
Fixing issues with files in modules/cms
Peer review of #679