Merge pull request #2115 from Sgoettschkes/card_scheme

[Validation] Update CardScheme
Merge pull request #2111 from WouterJ/patch-3

Fixed use of equals (closes #2109)
[#2111] Minor language tweaks
end short descriptions in PHPdoc comment with a .
made changes to take into account the new usage of the different content rendering strategies
fixed markup
switched usage of the include tag to the include function
Added missing path prefix `/admin` to access_control
Merge pull request #2121 from fabpot/content-renderer

Updated the docs for the new way to render partials/ESI/HInclude
[#2121] Fixing a now defunct include
Fix UsernameNotFoundException example (take 2)

here is the fix properly applied to master
Adding a small document on the changes related to trusting proxy data
[#2121] Tweaking a few things related to new render changes
Merge pull request #2127 from jrobeson/patch-2

Fix UsernameNotFoundException example (take 2)
Improved "Setting up Permissions"

Signed-off-by: Manuel Reinhard <manu@sprain.ch>
Update reference/dic_tags.rst
Merge pull request #2123 from gido/add_prefix_access_control

Added missing path prefix `/admin` to access_control
[#2123] Tweaking access control fix - I want to highlight how the access_control keys - unless suffixed with the regex $ - are not exact matches
Merge pull request #2131 from sprain/improving_setting_up_permissions

Improved "Setting up Permissions"
[#2131] Furthering the excellent permissions changes made by @sprain