Merge remote-tracking branch 'niels/good_old_merge' into devel

Conflicts:
	.gitignore
Added elgamal crypto for DH data and AESencoding for candidate lists
elgamal
Merge branch 'devel' of http://github.com/Devristo/tribler into devel

Conflicts:
	.gitignore
	Tribler/Core/APIImplementation/LaunchManyCore.py
	Tribler/community/anontunnel/community/ProxyCommunity.py