asd

asd
Revert "asd"

This reverts commit 4f921626cda9b8e45fcd428e256cebe00451b70c.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HeroPool/HeroPool/TestView.xaml