[ticket/10561] Casted $config['default_style'] to int

PHPBB3-10561
[ticket/10561] Added function desc for phpbb_style_is_active()

PHPBB3-10561
[ticket/10561] Changed $temp_style_id to $style_id

PHPBB3-10561
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()

Substituted $db->sql_query() with _sql()

PHPBB3-10561
Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympus

* sadu/ticket/10561:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).

Conflicts:
	phpBB/install/database_update.php
Merge remote-tracking branch 'github-cyberalien/ticket/10754' into develop

* github-cyberalien/ticket/10754:
  [ticket/10754] Changing $style to $phpbb_style
[ticket/10734] Moved style elements and fixed minor bugs

Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
[ticket/10774] Add unit tests for UNIQUE index existence and creation.

PHPBB3-10774
[ticket/10774] Correctly specify index name when creating unique index on MySQL.

PHPBB3-10774
Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympus

* github-bantu/ticket/10774:
  [ticket/10774] Correctly specify index name when creating unique index on MySQL.
  [ticket/10774] Add unit tests for UNIQUE index existence and creation.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10774] Correctly specify index name when creating unique index on MySQL.
  [ticket/10774] Add unit tests for UNIQUE index existence and creation.
[ticket/10734] Removed unwanted color elements

Deleted all the color elements from the common.css

PHPBB-10734
[ticket/10734] Fixed minor bug

Removed an extra empty line in colors.css

PHPBB-10734
Merge remote-tracking branch 'upstream/develop' into ticket/10734

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
[ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.

PHPBB3-10785
Merge remote-tracking branch 'callumacrae/ticket/10785' into develop

* callumacrae/ticket/10785:
  [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.
[ticket/10783] Added ?assets_version to assets.

PHPBB3-10783
[ticket/10783] Added assets_version to subsilver2.

PHPBB3-10783
[ticket/10783] Added assets_version to ACP and simple_*.html.

PHPBB3-10783