fixed a unitTest and spotted a bug

Conflicts:

	globaleaks/plugins/notification.py
manual merge for commit 26e87724974123a7a49459bb5a0e1aaa781cb3e7