testar merge
"TEST"
Merge branch 'master' of https://github.com/anneback/Intnet

Conflicts:
	DOTA2/bin/DOTA2.apk
	DOTA2/bin/classes.dex
	DOTA2/bin/classes/com/example/dota2/AdminModel.class
	DOTA2/bin/classes/com/example/dota2/Item.class
	DOTA2/bin/classes/com/example/dota2/ItemModel.class
	DOTA2/bin/classes/com/example/dota2/R$id.class
	DOTA2/bin/classes/com/example/dota2/R$layout.class
	DOTA2/bin/classes/com/example/dota2/R$menu.class
	DOTA2/bin/classes/com/example/dota2/R$string.class
	DOTA2/bin/classes/com/example/dota2/R$style.class
	DOTA2/bin/resources.ap_
	DOTA2/gen/com/example/dota2/R.java