linko scrapper
Merge remote-tracking branch 'origin/master-linko' into master-linko-

Conflicts:
	resources/site-packages/xbmctorrent/linkog.py