Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10240] Added optionset to mock_user in the tests.
  [ticket/10240] Fixed copyright year in censor_text_test.php.
  [ticket/10240] Fixed censor_text test assetEquals param order.
  [ticket/10240] Added censor_text tests for special characters.
  [ticket/10240] Added censor_text tests.

Conflicts:
	tests/mock/cache.php
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10354] Include cache directory path in unwritable message.

Conflicts:
	tests/template/template_test.php
[ticket/10350] Script for testing eval renderer

Script for testing eval renderer (fixed)

PHPBB3-10350
Merge remote-tracking branch 'cyberalien/ticket/10350' into develop

* cyberalien/ticket/10350:
  [ticket/10350] Script for testing eval renderer
  [ticket/10350] Fix for class phpbb_template_renderer_eval
Merge remote-tracking branch 'igorw/ticket/10155' into develop

* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
[ticket/10359] Fix phpbb_request regression in download/file.php

The phpbb_request object, utf-8 tools and request_var injection are missing.

PHPBB3-10359
Merge remote-tracking branch 'igorw/ticket/10359' into develop

* igorw/ticket/10359:
  [ticket/10359] Fix phpbb_request regression in download/file.php
[ticket/10359] Also include utf_tools in style.php because of request class.

PHPBB3-10359
Merge remote-tracking branch 'bantu/ticket/10359' into develop

* bantu/ticket/10359:
  [ticket/10359] Also include utf_tools in style.php because of request class.
[ticket/10322] Fix dynamic template includes

Dynamic template includes from variables was not implemented in the new
templating system.

PHPBB3-10322
[ticket/10322] Dynamic template include test

PHPBB3-10322
[ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632

I removed the fix of the original ticket and rebuild it with its own css class.
This also fixes the problem with the screwed up UCP Attachments page.

PHPBB3-6632
PHPBB3-10360
[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

When validating for HTML5, the name attribute is obsolete/deprecated
when used in anchor tags. The ID tag should be used here instead.

PHPBB3-10362
[ticket/10362] Revert subsilver2 changes

If subsilver2 will remain at XHTML then we do not need to make any
changes to its files.

PHPBB3-10362
Merge remote-tracking branch 'nickvergessen/ticket/10360' into develop

* nickvergessen/ticket/10360:
  [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632
Merge remote-tracking branch 'VSEphpbb/ticket/10362' into develop

* VSEphpbb/ticket/10362:
  [ticket/10362] Revert subsilver2 changes
  [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors
[ticket/10322] Separate template varref resolution from output generation

Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.

PHPBB3-10322
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
Merge remote-tracking branch 'github-noxwizard/ticket/10322' into develop

* github-noxwizard/ticket/10322:
  [ticket/10322] Separate template varref resolution from output generation
  [ticket/10322] Dynamic template include test
  [ticket/10322] Fix dynamic template includes