bugfixes for the email importer
marc added stuff
Merge branch 'master' of https://github.com/ialbert/biostar-central into istvan
Merge branch 'istvan'

Conflicts:
	biostar/server/management/commands/import_mbox.py