fix
fix wod lista raid lista chellenge lista ista
Merge branch 'master' of github.com:roboso/wbe

Conflicts:
	WoW-BossEncounter/bin/R.txt
	WoW-BossEncounter/bin/WoW-BossEncounter.apk
	WoW-BossEncounter/bin/classes.dex
	WoW-BossEncounter/bin/classes/com/example/wow_bossencounter/CataListaRaid.class
	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/WratListaRaid.class
	WoW-BossEncounter/bin/jarlist.cache
	WoW-BossEncounter/bin/resources.ap_
	WoW-BossEncounter/gen/com/example/wow_bossencounter/R.java