Merge branch 'ticket/12557' into 'ticket/12557ascraeus'

Conflicts:
	phpBB/includes/acp/acp_modules.php
	phpBB/phpbb/auth/auth.php
	phpBB/phpbb/db/driver/mysqli.php
	phpBB/phpbb/search/fulltext_mysql.php
[ticket/12557] Fix doc block errors found by Sami pt1

PHPBB3-12557
[ticket/12557] Notification fixes

PHPBB3-12557
[ticket/12557] Search, cron and profilefields fixes

PHPBB3-12557
[ticket/12557] Template fixes

PHPBB3-12557
[ticket/12557] Fix doc block errors found by Sami

More corrections.

PHPBB3-12557
[ticket/12557] Fix doc block errors found by Sami

More corrections.

PHPBB3-12557