Merge pull request #2263 from MissAllSunday/stuff

Stuff
! Fix a few errors with upgrade (fixes #2262)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Try chmod 755 and 775 first...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Handle stargmod.gif and ignore groups with no icons...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Tweaks to custom avatar directory handling

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

! Upgrade fixes
Merge pull request #2265 from MissAllSunday/stuff

	There are a few other places where Content-Type is been used
! add missing icons on PM menu fixes #2259

Signed-off-by: Antes <antes@simplemachines.org>
! Add icons to main menu

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

Add missing icons to Menus
Set boafrd/topic watch options using AJAX

Signed-off-by: John Rayes <live627@gmail.com>
! some cleaning inside jquery.sceditor.css
fixes #2267

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

! some cleaning inside jquery.sceditor.css
Merge pull request #2268 from live627/w

Set boafrd/topic watch options using AJAX
Apparently, this list is better...

Signed-off-by: John Rayes <live627@gmail.com>
! Missing semicolons cause weird problems.

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

! Missing semicolons cause weird problems.
Save a query if we know there aren't any items to display
#2269

Signed-off-by: Suki <suki@missallsunday.com>