'testing'
Merge branch 'master' of https://github.com/DeanNeal/dotaPicker

Conflicts:
	assets/js/entities/heroes.js
streams feature