fix linux dependency
Merge pull request #909 from LipuFei/fix_linux_dependency

Fix linux dependency
Update dispersy ref.
Merge pull request #911 from whirm/fix_remotesearch_test

Update dispersy ref.
Deal with circuit_id collision
Merge pull request #912 from egbertbouman/circuitid_collision

Deal with circuit_id collision
raise exception when images are not right
Merge pull request #913 from LipuFei/fix_image

raise exception when images are not right
Merge pull request #914 from Tribler/next

Merge next back to devel