xoa tung doan 1.8
Merge branch 'develop' of https://github.com/dotabox/CLGT into develop

Conflicts:
	js/lang.js