modifica Cata/Mop aggiunta immagine prova per cata
Modifica interfaccia Cata/Mop aggiunta immagine

Conflicts:
	WoW-BossEncounter/.classpath
	WoW-BossEncounter/bin/R.txt
	WoW-BossEncounter/bin/WoW-BossEncounter.apk
	WoW-BossEncounter/bin/classes.dex
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/MainActivity.class
	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/dexedLibs/android-support-v4-970a1e25549d5a7632802f37dc12547a.jar
	WoW-BossEncounter/bin/dexedLibs/android-support-v7-appcompat-2fc92799d057bf61a6bf86f79f871455.jar
	WoW-BossEncounter/bin/dexedLibs/appcompat_v7-177e0926d01e0f9b0062dad3aab7b3c4.jar
	WoW-BossEncounter/bin/jarlist.cache
	WoW-BossEncounter/bin/resources.ap_
	WoW-BossEncounter/gen/com/example/wow_bossencounter/R.java
	WoW-BossEncounter/res/layout/activity_mop_list_raid.xml