Adding 'forgot password' link to index page
PHPBB3-11950

Signed-off-by: Suhaib Khan <suhebjerk@gmail.com>
Merge pull request #1952 from suheb/ticket/11950

Ticket/11950 - Added 'forgot password' link to index page.
[ticket/11950] Fix prior commit

PHPBB3-11950
Merge remote-tracking branch 'EXreaction/ticket/11950' into develop

* EXreaction/ticket/11950:
  [ticket/11950] Fix prior commit
[ticket/12120] Add prototech to authors

PHPBB3-12120
[ticket/12120] Restore alphabetic order

PHPBB3-12120
Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus
Merge branch 'develop-olympus' into develop
[ticket/12125] Specify nth-child selectors separately - IE8 does not like them

PHPBB3-12125
Merge remote-tracking branch 'prototech/ticket/12125' into develop

* prototech/ticket/12125:
  [ticket/12125] Specify nth-child selectors separately - IE8 does not like them
[ticket/12118] Add noindex meta tag to subsilver2 view-print templates

PHPBB3-12118
Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympus

* vinny/ticket/12118:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
[ticket/12137] Fix spacing in smiley block.

PHPBB3-12137
Merge pull request #1965 from prototech/ticket/12137

[ticket/12137] Fix spacing in smiley block.

* prototech/ticket/12137:
  [ticket/12137] Fix spacing in smiley block.
[ticket/12119] Remove meta tags from view-print templates

PHPBB3-12119
Merge remote-tracking branch 'vinny/ticket/12119' into develop-olympus

* vinny/ticket/12119:
  [ticket/12119] Remove meta tags from view-print templates
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12119] Remove meta tags from view-print templates

Conflicts:
	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html