Updating backend/behaviours
Updating backend/classes
Updating single files in backend
Updating backend/controllers
Updating backend/database
Updating backend/facades
Updating modules/backend/formwidgets
Updating modules/backend/lang
Updating modules/backend/models
Updating modules/backend/skins
Updating modules/backend/traits
Updating modules/backend/widgets
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
Fixing minor issue
Fixing incorrect brackets
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
Be more specific about pathing, minor improvement to system settings table
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/backend