kp
k
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/app/static/hero-data/arthas
	web/app/static/hero-data/chen
	web/app/static/hero-data/falstad
	web/app/static/hero-data/gazlowe
	web/app/static/hero-data/kerrigan
	web/app/static/hero-data/malfurion
	web/app/static/hero-data/murky
	web/app/static/hero-data/nova
	web/app/static/hero-data/rehgar
	web/app/static/hero-data/tassadar
	web/app/static/hero-data/tyrael
	web/app/static/hero-data/uther
	web/app/static/hero-data/zeratul