[ticket/13082] Replace float by text-align

PHPBB3-13082
[ticket/13082] move style to css file

PHPBB3-13082
[ticket/13082] Join classes

PHPBB3-13082
[ticket/13082] Repair fix

PHPBB3-13082
[ticket/13070] Use old 'template' class for template class hook

PHPBB3-13070
[ticket/13094] Condition search properly

PHPBB3-13094
[ticket/13048] Only do not update the session page for ajax requests

The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.

PHPBB3-13048
[ticket/13097] Add missing unit type

PHPBB3-13097
[ticket/12889] Fix multiple select lists

PHPBB3-12889
Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeus

* hanakin/ticket/13097:
  [ticket/13097] Add missing unit type
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13097] Add missing unit type
Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus

* Senky/ticket/13082:
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus

* hanakin/ticket/12889:
  [ticket/12889] Fix multiple select lists
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12889] Fix multiple select lists
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.

PHPBB3-13011
[ticket/13096] Add phpbb_ prefix to ldap_escape()

PHPBB3-13096
Merge pull request #2989 from Senky/ticket/13096

[ticket/13096] ldap_escape() added to PHP 5.6.0

* Senky/ticket/13096:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()

Conflicts:
	phpBB/includes/auth/auth_ldap.php
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
Merge pull request #2982 from marc1706/ticket/13070

[ticket/13070] Use old 'template' class for template class hook

* marc1706/ticket/13070:
  [ticket/13070] Use old 'template' class for template class hook