removed lock
Merge branch 'devel' of github.com:/Devristo/tribler into devel