fix touch

Signed-off-by: Illori <illori@simplemachines.org>
Merge pull request #2138 from illori/touch_load.php

fix touch rest of #2120
! Don't show enoticon button when no smileys present (#2128)

Signed-off-by: John Rayes <live627@gmail.com>
! Harmonise alignment for admin quick search boxes

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2140 from live627/dev

Dev
last fix for #2120

Signed-off-by: Illori <illori@simplemachines.org>
remove modifykarma

Signed-off-by: Illori <illori@simplemachines.org>
Merge pull request #2144 from illori/karma

remove modifykarma
Merge pull request #2142 from illori/touch_load.php

last fix for #2120
! The CreatePost-Notify background task expects "msg" for both posts and topics

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

! The CreatePost-Notify background task expects "msg" for both posts and...
! duplicate name in the check array

Signed-off-by: Spuds <spuds@spudsdesign.com>
Duplicated class .generic_icons.warning_watch

Signed-off-by: Diego Andrés <diegoandres_cortes@outlook.com>
! Typo (fixes #2146)

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

! Typo (fixes #2146)
Merge pull request #2150 from DiegoCortes/patch-2

Duplicated class .generic_icons.warning_watch
Merge pull request #2152 from live627/dev

! duplicate name in the check array
! Remove debugging code and fix a typo

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

! Remove debugging code and fix a typo
Why always :( do ... hard ... way...

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

# By Illori (3) and others
# Via Michael Eshom (7) and John Rayes (3)
* 'release-2.1' of git://github.com/simplemachines/SMF2.1:
  ! Remove debugging code and fix a typo
  ! Typo (fixes #2146)
  Duplicated class .generic_icons.warning_watch
  ! duplicate name in the check array
  ! The CreatePost-Notify background task expects "msg" for both posts and topics
  remove modifykarma
  last fix for #2120
  ! Harmonise alignment for admin quick search boxes
  ! Don't show enoticon button when no smileys present (#2128)
  fix touch

Conflicts:
	Themes/default/css/index.css

Signed-off-by: Antes <antes@simplemachines.org>