fixed a unitTest and spotted a bug

Conflicts:

	globaleaks/plugins/notification.py
manual merge for commit 26e87724974123a7a49459bb5a0e1aaa781cb3e7
removed the gpg_encryption include (coming from a future merge)
.travis.yml updated
fixed apparmor profile for tor
corrected setup.py to include translations.js (temporary fix before minification)
corrected setup.py to include translations.js (temporary fix before minification)
updated hardcoded email/password used for development purpose
fixed credential + 0.2.0.20
Merge branch 'master' into feature/gpg-notification

Conflicts:
	globaleaks/db/__init__.py
	globaleaks/plugins/notification.py
	setup.py
fixed -j (cyclone debug) bug