hero image and ser
test
test
test
test2
Merge branch 'test' of https://github.com/halamourinho/zDota.git
hero list
first
Merge branch 'test' of https://github.com/halamourinho/zDota.git into LYF

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/lyf/zDota/activity/MainActivity.java
合并完成
修复dotamax改动后出现的bug
修改list与查找
Merge branch 'test' of https://github.com/halamourinho/zDota.git into LYF