Added tilde expansion in torrent constructor
Astyle'd
Merge pull request #115 from gtorrent/wip/tilde-expansion

Added tilde expansion in torrent constructor
Update how versions are generated

Part of changes made in gt-gtk
Merge branch 'master' into wip/peer
Merge branch 'master' into wip/peer

Conflicts:
	src/CMakeLists.txt
Merge pull request #116 from gtorrent/wip/peer

Wip/peer
Merge master in wip/dht