resurect
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/dota_addons/cf/resource/addon_english.txt