peerwire repaired
Merge branch 'master' into cerkiewny
Merge branch 'master' into cerkiewny
first step towards scheduling
Merge branch 'master' into cerkiewny