merging
meeeerge Merge branch 'master' of https://github.com/anneback/Intnet

Conflicts:
	DOTA2/bin/classes/com/example/dota2/ItemsActivity.class
	DOTA2/bin/classes/com/example/dota2/MainActivity.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/gen/com/example/dota2/R.java