Yay for redundancy...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2315 from Antes/theme_fix

! Icon position fix
Merge pull request #2320 from Antes/theme_fix

Icon fix leftover
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1
Merge pull request #2314 from Oldiesmann/release-2.1

Yay for redundancy...
! Consistency is a good thing...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2323 from Oldiesmann/release-2.1

! Consistency is a good thing...
Use filter_var for email validation  (fixes #2321)

Signed-off-by: John Rayes <live627@gmail.com>
Tweak the display title (#2319)

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2325 from live627/release-2.1a

Some small changes
Merge branch 'release-2.1' of git://github.com/simplemachines/SMF2.1 into theme_fix

# By John Rayes (2) and Michael Eshom (2)
# Via John Rayes (4) and Michael Eshom (3)
* 'release-2.1' of git://github.com/simplemachines/SMF2.1:
  Tweak the display title (#2319)
  Use filter_var for email validation  (fixes #2321)
  ! Consistency is a good thing...
  Yay for redundancy...