cambio grafico mop. aggiunta layout per boss mop
Spostamento Icone mop

Conflicts:
	WoW-BossEncounter/.classpath
	WoW-BossEncounter/bin/R.txt
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$id.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$integer.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$layout.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$menu.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$string.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$style.class
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/R$styleable.class
	WoW-BossEncounter/bin/jarlist.cache
	WoW-BossEncounter/gen/com/example/wow_bossencounter/R.java