Merge branch 'develop' into feature/merging-style-components

* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
[ticket/10736] Changing travis so it installs composer.phar to phpBB/

PHPBB3-10736
Merge pull request #672 from unknownbliss/ticket/10736

[ticket/10736] Changing travis so it installs composer.phar to phpBB/
[ticket/10736] Run composer in phing builds

PHPBB3-10736
Merge pull request #673 from naderman/ticket/10736

[ticket/10736] Run composer in phing builds
[feature/merging-style-components] Updating styles in coding guidelines

Updating styles section in coding guidelines

PHPBB3-10632
[feature/merging-style-components] Fix notices in acp_styles

PHPBB3-10632
[feature/merging-style-components] Fixing few errors in acp_styles

Fixing notices and usability issues

PHPBB3-10632
[feature/merging-style-components] Initializing locator and provider separately

Moving locator and path provider initialization out of style class

PHPBB3-10632
[feature/merging-style-components] Renaming "delete" to "uninstall" for styles

Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
[feature/merging-style-components] Moving template initialization out of style

Moving template initialization out of style constructor

PHPBB3-10632
[feature/merging-style-components] Fix for unit tests

Fixing typo in template unit tests

PHPBB3-10632
[feature/merging-style-components] Fix back link on install page

When on install page and all styles are installed, fix back link to go to main
styles page.

PHPBB3-10632
Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop

* cyberalien/feature/merging-style-components: (31 commits)
  [feature/merging-style-components] Fix back link on install page
  [feature/merging-style-components] Fix for unit tests
  [feature/merging-style-components] Moving template initialization out of style
  [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
  [feature/merging-style-components] Initializing locator and provider separately
  [feature/merging-style-components] Fixing few errors in acp_styles
  [feature/merging-style-components] Fix notices in acp_styles
  [feature/merging-style-components] Updating styles in coding guidelines
  [feature/merging-style-components] Changing acp_styles text
  [feature/merging-style-components] Updating test cases
  [feature/merging-style-components] Updating style initialization
  [feature/merging-style-components] Changing style class
  [feature/merging-style-components] Changing template class
  [feature/merging-style-components] Changing resource locator
  [feature/merging-style-components] Changing path provider
  [feature/merging-style-components] Renaming style locator
  [feature/merging-style-components] Changing $style to $style_id
  [feature/merging-style-components] Creating style class
  [feature/merging-style-components] New acp_styles template
  [feature/merging-style-components] New acp_styles
  ...
[feature/merging-style-components] Fixing typo in database updater

Fixing typo in database_update.php

PHPBB3-10632
Merge pull request #675 from cyberalien/feature/merging-style-components

[feature/merging-style-components] Fixing typo in database updater
Merge remote-tracking branch 'upstream/develop' into feature/class-prefix

* upstream/develop: (34 commits)
  [feature/merging-style-components] Fixing typo in database updater
  [feature/merging-style-components] Fix back link on install page
  [feature/merging-style-components] Fix for unit tests
  [feature/merging-style-components] Moving template initialization out of style
  [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
  [feature/merging-style-components] Initializing locator and provider separately
  [feature/merging-style-components] Fixing few errors in acp_styles
  [feature/merging-style-components] Fix notices in acp_styles
  [feature/merging-style-components] Updating styles in coding guidelines
  [ticket/10736] Run composer in phing builds
  [ticket/10736] Changing travis so it installs composer.phar to phpBB/
  [feature/merging-style-components] Changing acp_styles text
  [feature/merging-style-components] Updating test cases
  [feature/merging-style-components] Updating style initialization
  [feature/merging-style-components] Changing style class
  [feature/merging-style-components] Changing template class
  [feature/merging-style-components] Changing resource locator
  [feature/merging-style-components] Changing path provider
  [feature/merging-style-components] Renaming style locator
  [feature/merging-style-components] Changing $style to $style_id
  ...

Conflicts:
	phpBB/includes/session.php