Add active id to options if input widget has a model fixes #1550
Update change log
add old yii-ext twig renderer's function into this. and as per yii2's view system changed so for now add simple directory of file based file loader for twig
add old yii-ext twig renderer's function into this. and as per yii2's view system changed so for now add simple directory of file based file loader for twig
minor typos
Merge remote-tracking branch 'upstream/master'

Conflicts:
	extensions/yii/jui/CHANGELOG.md
fixes code style.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update change log
  Add active id to options if input widget has a model fixes #1550
image helper proposal
Merge branch 'upstream' into 46-image-helper

* upstream:
  Fixed CSRF token masking issue.
  improved error message of calling invalid scope method.
  Fixed repo URL
  Fixes #1650: Added Connection::pdoClass.
  code style fix.
  added changelog
  codestyle fix
  improved checkIntegrity method
  Modified extension guidlines
  fix sphinx command signature
  fixed bug with forgotten param, fixed behavior for one table integrity
  fixed sequence reset
  added postgresql features to reset seq/check integrity
Merge branch 'upstream'

* upstream:
  Fixed CSRF token masking issue.
  improved error message of calling invalid scope method.
  Fixed repo URL
  Fixes #1650: Added Connection::pdoClass.
  code style fix.
  added changelog
  codestyle fix
  improved checkIntegrity method
  Modified extension guidlines
  fix sphinx command signature
  fixed bug with forgotten param, fixed behavior for one table integrity
  fixed sequence reset
  added postgresql features to reset seq/check integrity
fix merging issues
remove use of dumb static variable
Updated git-workflow.md to remove a false link

Replaced link to gitref.org to try.github.com as gitref.org is down.
Fixes #1604: fixed URL and cookie problems.
Refactored tests.
Merge pull request #1678 from suralc/patch-3

Updated git-workflow.md to remove a false link
Merge remote-tracking branch 'origin/master' into 46-image-helper

* origin/master:
added frame method
Fixed DB query logging category.
Merge branch 'debug_module_improvements' of github.com:Ragazzo/yii2 into Ragazzo-debug_module_improvements

Conflicts:
	extensions/yii/debug/panels/DbPanel.php