fix swift for linux
Merge pull request #829 from LipuFei/fix_swift

fix swift for linux
fix swift windows build again
Merge pull request #830 from LipuFei/fix_swift

fix swift windows build again
Merge pull request #835 from Tribler/next

Merge next back to devel