Simplified keepalive code, however behaviour shouldnt be any different
dasad
Merge branch 'devel' of github.com:Devristo/tribler into devel