SMTP over SSL renamed as SMTPS
uuff
Merge branch 'master' of http://github.com/globaleaks/GLBackend

Conflicts:
	globaleaks/utils.py
Merge branch 'master' of http://github.com/globaleaks/GLBackend
implemented scrypt hashing and unitTest https://github.com/globaleaks/GlobaLeaks/issues/85