set import_id on imported posts
Update admin rake task
WIP: New site setting to show subcategory list on category list
Enable trust level 3 promotion/demotion job
better generic "posting error" in email replies
Merge pull request #2489 from techAPJ/update_rake_task

Update admin rake task
FIX: tighten up email token durations
Add link to badge reason on badge details page.
FEATURE: enable badges by default.
FIX: regression, forgot password broken

also... mocks were invented by the devil
FIX: tests to pass with badges enabled
FIX: 100% cpu while parsing feeds
Update admin create task
better email deliverability guidance
add one more SPF syntax link to email test
FEATURE: Send notification by system user for bulk invite
Merge pull request #2491 from techAPJ/system-user-notifications

FEATURE: Send notification by system user for bulk invite
Send notifications for backup/restore from system user
Merge pull request #2492 from techAPJ/system-user-notifications

Send notifications for backup/restore from system user
lock alignment is better with vertical-align:middle