! Assorted merge-related fixes

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

! Assorted merge-related fixes
+ Don't allow merging of redirection topics

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

+ Don't allow merging of redirection topics
! Redo the sprite with some help (Thanks to: http://draeton.github.io/stitches/)
! del_small removed (Generic icons are already 16x16, on mobile del_small is kinda untouchable)
! Next/Previous Page moved to generic_icons (Better not to define them again and again)

Signed-off-by: Antes <antes@simplemachines.org>
! those extra margins no longer needed with new sprite.

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #2597 from Antes/sprite

Generic Icons
! Typo fix

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

! Typo fix
Increase the quality of message icons

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #2599 from Antes/sprite

Increase the quality of message icons