[feature/remove-imagesets] Changing prosilver

Removing imagesets. Changing prosilver

PHPBB3-10336
[feature/remove-imagesets] Changing subsilver

Removing imagesets. Changing subsilver

PHPBB3-10336
[feature/remove-imagesets] Script for converting imageset to css

Removing imagesets. Script for converting imageset to css

PHPBB3-10336
[ticket/10350] Fix for class phpbb_template_renderer_eval

Fixing bug in class phpbb_template_renderer_eval

PHPBB3-10350
[ticket/10355] Correctly end output buffering in template tests.

This code was copied verbatim from develop-olympus.

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

* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
Merge remote-tracking branch 'bantu/ticket/9474' into develop

* bantu/ticket/9474:
  [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
Merge remote-tracking branch 'p/ticket/10355' into develop

* p/ticket/10355:
  [ticket/10355] Correctly end output buffering in template tests.
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