Upgrading html emails

Merged against django-userena master, because i needed the new html emails functionality for the emif project.

@bastiao: revise the alterations to userena/admin.py, im not sure about some of the conflict resolutions (though i didn't see anything break from them)