doc
Merge branch 'devel' of http://github.com/Devristo/tribler into devel