Update team members
Merge pull request #2188 from Oldiesmann/release-2.1

! Don't allow invalid values for time to stay logged in (fixes #2185)
call_helper() can now handle this.

Signed-off-by: Suki <suki@missallsunday.com>
call_helper can now handle this.

Signed-off-by: Suki <suki@missallsunday.com>
Revamp PM notifications to use alert preferences

Not moving PMs to background task since it's
1) E-mail only
2) High priority enough to get handled instantly

Fixes #2038

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Merge pull request #2192 from Dragooon/pm-notif

Revamp PM notifications to use alert preferences
Merge pull request #2193 from Oldiesmann/release-2.1

- Kill the "latest smileys" block
Merge pull request #2194 from Oldiesmann/release-2.1

! field_icons -> generic_icons
Allow expiring subscriptions to be notified via alerts

Fixes #1330

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Merge pull request #2197 from Dragooon/release-2.1

Allow expiring subscriptions to be notified via alerts
Merge pull request #2190 from MissAllSunday/stuff

Unneeded code
Don't show Paid Subs alert settings if they're disabled

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Merge pull request #2198 from Dragooon/release-2.1

Don't show Paid Subs alert settings if they're disabled
Merge pull request #2200 from Oldiesmann/release-2.1

! Tweak the handling of smiley set deletion to make it a bit more logical...
! close the smiley set list fixes #2201

Signed-off-by: Antes <antes@simplemachines.org>
! login box in top dropdowns (little dirty fix? :P) fixes #2186

Signed-off-by: Antes <antes@simplemachines.org>
small improvements for 480p

Signed-off-by: Antes <antes@simplemachines.org>
! Fix bug introduced in 75b612c1e2538e9b62467ef7f6197d959b663c1c

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

! close the smiley set list fixes #2201
Merge pull request #2170 from colinschoen/release-2.1

Update team members