merge with default

--HG--
branch : stable
add STATIC_ROOT to test conf

--HG--
branch : stable
Created new branch subscriptions

--HG--
branch : subscriptions
Setting to override the default handler for sending notification emails when there is a reply to a subscribed topic

--HG--
branch : subscriptions
Merged in tomds/djangobb/subscriptions (pull request #38)

Setting to override notification behaviour
Merged in tomds/djangobb/email_settings (pull request #39)

Setting to globally disable all user-to-user email sending
Merged in tomds/djangobb/email_settings (pull request #40)

Addition to #39: also hide email address on user profile page if USER_TO_USER_EMAIL is False
Python 3 fix: dictionary changed size during iteration

Under python 3, this error would pop as soon as a user or guest times out.
sync with stable
fix send_mail() when no HTML content was given
In commit "remove print from subscription" the EMAIL_DEBUG setting was
removed from send_mail().  The msg.send() was mistakingly moved inside
the if html: body.

This patch fixes the bug so email is also sent when no HTML content was
given.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>