Merge pull request #1352 from Arantor/release-2.1

! Make the top 'login or register' login button be a nice overlay for th...
Merge pull request #1353 from Arantor/release-2.1

! oops, forgot to add this one too.
Minor tweaks/fixes

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

! More things we don't need any more.
Whoops. How'd that get there?

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

Minor tweaks/fixes
! Deleting PM labels didn't work

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

! Deleting PM labels didn't work
! Fix several PM label bugs

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

! Fix several PM label bugs
! LIMIT 1 makes no sense on a query that does COUNT()

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

! LIMIT 1 makes no sense on a query that does COUNT()
! More logic issues...

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

! More logic issues...
! Replying to PMs lead to SMF showing a negative number of unread messages

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

! Replying to PMs lead to SMF showing a negative number of unread messag...
! Missing ] caused a parse error

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

! Missing ] caused a parse error
+ Add new setting for Paypal Sandbox email (fixes #1168)

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

+ Add new setting for Paypal Sandbox email (fixes #1168)