case of no mail
more transaction magic
some small updates
working on a train
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into virtuoso

Conflicts:
	assembl/source/models/mail.py