Merge branch 'labels'

Conflicts:
	src/Torrent.cpp
Merge branch 'master' into wip/looks-familiar

Conflicts:
	include/gtorrent/Torrent.hpp
	src/Torrent.cpp