Conflicts:
	framework/CHANGELOG.md

Fix #3531, allow more chars in \yii\grid\GridView's short syntax for columns.

Update security-authorization.md

Typo

typo

Small typo in the framework/rbac/PhpManager.php

Advanced app's common tests codeception generated files added to .gitignore

`VarDumper::export()` applied over framework.

Handle invalid code sequences in Html::encode()

Fix for #3232 var export