Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11094] Add textbox for jabber while memberlist search
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
Merge branch 'develop-olympus' into develop

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into develop

* dhruvgoel92/ticket/11503:
  [ticket/11503] similar implementation for mssql_native and odbc
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
[ticket/11615] Rename init_test to creation_test for clarity

PHPBB3-11615
[ticket/11615] Rename class in file to match

PHPBB3-11615
[ticket/11615] Remove magic number in creation_test

Removing this magic number to its own variable
with clean multiplication makes it clear
what the number represents.

PHPBB3-11615
[ticket/11615] Fix typo in creation_test

PHPBB3-11615
Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus

* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus

* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
Merge branch 'develop-olympus' into develop

* develop-olympus:
[ticket/11618] Replace glob() with scandir() and string matching

Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus

* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php
Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into develop

* dhruvgoel92/ticket/11593:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop

* dhruvgoel92/ticket/9341:
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars
Merge branch 'ticket/11566' into ticket/11566-develop

* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php