Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php

phpBB/language/en/common.php

@@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
+	'CONTACT_USER'			=> 'Contact',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 

phpBB/language/en/memberlist.php

@@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
 	'BEFORE'				=> 'Before',
 
 	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
-	'CONTACT_USER'			=> 'Contact',
 
 	'DEST_LANG'				=> 'Language',
 	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',