added default to_dict method to base Model class
backports from django 1.6 (these will be needed later, just trying to minimize the diff file between this branch and userena branch)
addition of function to escape html entities
missed some imports
Merge remote-tracking branch 'dieselmachine/latest' into develop