Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10437] Do not display announcements that are waiting for approval
[ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read

PHPBB3-10365
[ticket/9066] Disallow some database prefix to prevent same errors and problems

With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympus

* igorw/ticket/10365:
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10365] Require m_report permission to see reports in mcp_post
  [ticket/10365] Make sure moderators only get mcp_reports link when allowed
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10365] Require m_report permission to see reports in mcp_post
  [ticket/10365] Make sure moderators only get mcp_reports link when allowed
Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus

* bantu/ticket/10190:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
[ticket/7138] Allow simple header and footer for trigger_error() messages

Adds a template condition using S_SIMPLE_MESSAGE that must be set to true
before calling trigger_error() which will automatically use the simple
header and footer files in the template directory instead of the overall
header and footer files.

PHPBB3-7138
[ticket/10453] PM viewmessage page is misplacing the online icon

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
Merge remote-tracking branch 'nickvergessen/ticket/7138' into develop-olympus

* nickvergessen/ticket/7138:
  [ticket/7138] Allow simple header and footer for trigger_error() messages
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/7138] Allow simple header and footer for trigger_error() messages

Conflicts:
	phpBB/styles/prosilver/template/message_body.html
Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus

* igorw/ticket/8616:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus

* igorw/ticket/10087:
  [ticket/10087] Organize bans in acp_baninto optgroups
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10087] Organize bans in acp_baninto optgroups
[ticket/10254] Remove style names from themes and fix some informations on it.

PHPBB3-10254
[ticket/10254] Remove subsilver2 as default style on theme.

PHPBB3-10254
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.

PHPBB3-10254
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.

PHPBB3-10254
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css

PHPBB3-10254