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
合并完成